Merge branch 'feature/pay'

webht/third_party/pay/controllers/iPayLinksService.php

@@ -556,6 +556,8 @@ class IPayLinksService extends CI_Controller
                 $remark_info = json_decode($item->IPL_memo);
                 (isset($remark_info->remark)) ? $remark_info = json_decode($remark_info->remark) : NULL;
                 $ln = (isset($remark_info->ln)) ? $remark_info->ln : "en";
+                $ln = strtolower(strstr($ln, "_", true));
+                $ln = $ln==='ja' ? 'jp' : $ln;
                 $this->lang->load('ipl_common',$ln);
                 $this->lang->load('ipl_buyer_email',$ln);
                 $item->text = $this->lang->language;