Merge pull request #502 from betaxab/update-lang-php

lang: update language

app/Payments/StripeAlipay.php

@@ -40,7 +40,7 @@ class StripeAlipay {
         $currency = $this->config['currency'];
         $exchange = $this->exchange('CNY', strtoupper($currency));
         if (!$exchange) {
-            abort(500, __('user.order.stripeAlipay.currency_convert_timeout'));
+            abort(500, __('Currency conversion has timed out, please try again later'));
         }
         Stripe::setApiKey($this->config['stripe_sk_live']);
         $source = Source::create([
@@ -58,7 +58,7 @@ class StripeAlipay {
             ]
         ]);
         if (!$source['redirect']['url']) {
-            abort(500, __('user.order.stripeAlipay.gateway_request_failed'));
+            abort(500, __('Payment gateway request failed'));
         }
         return [
             'type' => 1,

app/Payments/StripeCredit.php

@@ -46,7 +46,7 @@ class StripeCredit {
         $currency = $this->config['currency'];
         $exchange = $this->exchange('CNY', strtoupper($currency));
         if (!$exchange) {
-            abort(500, __('user.order.stripeCard.currency_convert_timeout'));
+            abort(500, __('Currency conversion has timed out, please try again later'));
         }
         Stripe::setApiKey($this->config['stripe_sk_live']);
         try {
@@ -62,10 +62,10 @@ class StripeCredit {
             ]);
         } catch (\Exception $e) {
             info($e);
-            abort(500, __('user.order.stripeCard.was_problem'));
+            abort(500, __('Payment failed. Please check your credit card information'));
         }
         if (!$charge->paid) {
-            abort(500, __('user.order.stripeCard.deduction_failed'));
+            abort(500, __('Payment failed. Please check your credit card information'));
         }
         return [
             'type' => 2,

app/Payments/StripeWepay.php

@@ -40,7 +40,7 @@ class StripeWepay {
         $currency = $this->config['currency'];
         $exchange = $this->exchange('CNY', strtoupper($currency));
         if (!$exchange) {
-            abort(500, __('user.order.stripeAlipay.currency_convert_timeout'));
+            abort(500, __('Currency conversion has timed out, please try again later'));
         }
         Stripe::setApiKey($this->config['stripe_sk_live']);
         $source = Source::create([
@@ -58,7 +58,7 @@ class StripeWepay {
             ]
         ]);
         if (!$source['wechat']['qr_code_url']) {
-            abort(500, __('user.order.stripeWepay.gateway_request_failed'));
+            abort(500, __('Payment gateway request failed'));
         }
         return [
             'type' => 0,

resources/lang/zh-CN.json

@@ -37,11 +37,11 @@
     "Cancel failed": "取消失败",
     "Currency conversion has timed out, please try again later": "货币转换超时，请稍后再试",
     "Payment gateway request failed": "支付网关请求失败",
-    "Oops, there's a problem... Please refresh the page and try again later": "到了点问题，请刷新页面稍后再试",
+    "Oops, there's a problem... Please refresh the page and try again later": "出现了点问题，请刷新页面稍后再试",
     "Payment failed. Please check your credit card information": "扣款失败，请检查信用卡信息",
     "Article does not exist": "文章不存在",
     "No active subscription. Unable to use our provided Apple ID": "无有效订阅，无法使用本站提供的 AppleID",
-    "You must have a valid subscription to view content in this area": "你必须拥有有效的订阅才可以查看该区域的内容",
+    "You must have a valid subscription to view content in this area": "您必须拥有有效的订阅才可以查看该区域的内容",
     "The maximum number of creations has been reached": "已达到创建数量上限",
     "Coupon cannot be empty": "优惠券不能为空",
     "This coupon is no longer available": "优惠券已无可用次数",
@@ -56,16 +56,16 @@
     "You must use the invitation code to register": "必须使用邀请码才可以注册",
     "Email verification code cannot be empty": "邮箱验证码不能为空",
     "Incorrect email verification code": "邮箱验证码有误",
-    "Email already exists": "邮箱已存在系统中",
+    "Email already exists": "邮箱已在系统中存在",
     "Invalid invitation code": "邀请码无效",
     "Register failed": "注册失败",
     "Incorrect email or password": "邮箱或密码错误",
     "Your account has been suspended": "该账户已被停止使用",
     "Token error": "令牌有误",
     "This email is not registered in the system": "该邮箱不存在系统中",
-    "Email verification code has been sent, please request again later": "验证码已发送，请过一会再请求",
+    "Email verification code has been sent, please request again later": "验证码已发送，请过一会儿再请求",
     "Email verification code": "邮箱验证码",
-    "Plan ID cannot be empty": "套餐ID不能为空",
+    "Plan ID cannot be empty": "套餐 ID 不能为空",
     "Plan period cannot be empty": "套餐周期不能为空",
     "Wrong plan period": "套餐周期参数有误",
     "Ticket subject cannot be empty": "工单主题不能为空",
@@ -75,7 +75,7 @@
     "The withdrawal account cannot be empty": "提现账号不能为空",
     "Old password cannot be empty": "旧密码不能为空",
     "New password cannot be empty": "新密码不能为空",
-    "Password must be greater than 8 digits": "密码必须大于8个字符",
+    "Password must be greater than 8 digits": "密码必须大于 8 个字符",
     "The transfer amount cannot be empty": "划转金额不能为空",
     "The transfer amount parameter is wrong": "划转金额参数有误",
     "Incorrect format of expiration reminder": "过期提醒参数有误",
@@ -83,8 +83,8 @@
     "Email can not be empty": "邮箱不能为空",
     "Email format is incorrect": "邮箱格式不正确",
     "Password can not be empty": "密码不能为空",
-    "The traffic usage in :app_name has reached 80%": "在:app_name的流量使用已达到80%",
+    "The traffic usage in :app_name has reached 80%": "在 :app_name 的已用流量已达到 80%",
-    "The service in :app_name is about to expire": "在:app_name的服务即将到期",
+    "The service in :app_name is about to expire": "在 :app_name 的服务即将到期",
-    "The coupon can only be used :limit_use_with_user per person": "该优惠券每人只能用:limit_use_with_user次",
+    "The coupon can only be used :limit_use_with_user per person": "该优惠券每人只能用 :limit_use_with_user 次",
-    "The coupon code cannot be used for this period": "该优惠券无法用于这个付款周期"
+    "The coupon code cannot be used for this period": "此优惠券无法用于该付款周期"
 }