Merge pull request #388 from betaxab/p1

resources/lang/en-US/passport.php

@@ -0,0 +1,37 @@
+<?php
+
+return [
+    'auth' => [
+        'register' => [
+            'verify_incorrect' => 'Invalid code is incorrect',
+            'email_suffix_not_in_whitelist' => 'Email suffix is not in the Whitelist',
+            'no_support_gmail_alias' => 'Gmail alias is not supported',
+            'close_register' => 'Registration has closed',
+            'must_use_invite_code' => 'You must use the invitation code to register',
+            'email_code_not_empty' => 'Email verification code cannot be empty',
+            'email_code_incorrect' => 'Incorrect email verification code',
+            'email_exist_system' => 'Email already exists',
+            'invalid_invite_code' => 'Invalid invitation code',
+            'register_failed' => 'Register failed'
+        ],
+        'login' => [
+            'wrong_email_or_password' => 'Incorrect email or password',
+            'account_been_discontinued' => 'Your account has been suspended'
+        ],
+        'getQuickLoginUrl' => [
+            'wrong_token' => 'Token error'
+        ],
+        'forget' => [
+            'email_verification_code_incorrect' => 'Incorrect email verification code',
+            'email_not_exist_system' => 'This email is not registered in the system',
+            'reset_failed' => 'Reset failed'
+        ]
+    ],
+    'comm' => [
+        'sendEmailVerify' => [
+            'verification_code_incorrect' => 'Incorrect email verification code',
+            'code_sent_request_later' => 'Email verification code has been sent, please request again later',
+            'email_verification_code' => 'Email verification code'
+        ]
+    ]
+];

resources/lang/en-US/user.php

@@ -0,0 +1,131 @@
+<?php
+
+return [
+    'user' => [
+        'changePassword' => [
+            'user_not_exist' => 'The user does not exist',
+            'old_password_wrong' => 'The old password is wrong',
+            'save_failed' => 'Save failed'
+        ],
+        'info' => [
+            'user_not_exist' => 'The user does not exist'
+        ],
+        'getSubscribe' => [
+            'user_not_exist' => 'The user does not exist',
+            'plan_not_exist' => 'Subscription plan does not exist',
+        ],
+        'resetSecurity' => [
+            'user_not_exist' => 'The user does not exist',
+            'reset_failed' => 'Reset failed'
+        ],
+        'update' => [
+            'user_not_exist' => 'The user does not exist',
+            'save_failed' => 'Save failed',
+        ],
+        'transfer' => [
+            'user_not_exist' => 'The user does not exist',
+            'params_wrong' => 'Invalid parameter',
+            'insufficient_commission_balance' => 'Insufficient commission balance',
+            'transfer_failed' => 'Transfer failed'
+        ]
+    ],
+    'ticket' => [
+        'fetch' => [
+            'ticket_not_exist' => 'Ticket does not exist',
+        ],
+        'save' => [
+            'exist_other_open_ticket' => 'There are other unresolved tickets',
+            'ticket_create_failed' => 'Failed to open ticket',
+        ],
+        'reply' => [
+            'params_wrong' => 'Invalid parameter',
+            'message_not_empty' => 'Message cannot be empty',
+            'ticket_not_exist' => 'Ticket does not exist',
+            'ticket_close_not_reply' => 'The ticket is closed and cannot be replied',
+            'wait_reply' => 'Please wait for the technical enginneer to reply',
+            'ticket_reply_failed' => 'Ticket reply failed',
+        ],
+        'close' => [
+            'params_wrong' => 'Invalid parameter',
+            'ticket_not_exist' => 'Ticket does not exist',
+            'close_failed' => 'Close failed',
+        ],
+        'withdraw' => [
+            'not_support_withdraw_method' => 'Unsupported withdrawal method',
+            'system_require_withdraw_limit' => 'The current required minimum withdrawal commission is: ¥:limitCNY',
+            'ticket_subject' => '[Commission Withdrawal Request] This ticket is opened by the system',
+            'ticket_create_failed' => 'Failed to open ticket',
+            'ticket_message' => "Withdrawal method: :method\r\nPayment account: :account\r\n"
+        ]
+    ],
+    'plan' => [
+        'fetch' => [
+            'plan_not_exist' => 'Subscription plan does not exist'
+        ]
+    ],
+    'order' => [
+        'details' => [
+            'order_not_exist' => 'Order does not exist',
+            'plan_not_exist' => 'Subscription plan does not exist',
+        ],
+        'save' => [
+            'plan_not_exist' => 'Subscription plan does not exist',
+            'exist_open_order' => 'You have an unpaid or pending order, please try again later or cancel it',
+            'plan_stop_sell' => 'This subscription has been sold out, please choose another subscription',
+            'plan_stop_renew' => 'This subscription cannot be renewed, please change to another subscription',
+            'plan_stop' => 'This payment cycle cannot be purchased, please choose another cycle',
+            'plan_exist_not_buy_package' => 'Subscription has expired or no active subscription, unable to purchase Data Reset Package',
+            'plan_expired' => 'This subscription has expired, please change to another subscription',
+            'coupon_use_failed' => 'Invalid coupon',
+            'insufficient_balance' => 'Insufficient balance',
+            'order_create_failed' => 'Failed to create order'
+        ],
+        'checkout' => [
+            'order_not_exist_or_paid' => 'Order does not exist or has been paid',
+            'pay_method_not_use' => 'Payment method is not available',
+        ],
+        'check' => [
+            'order_not_exist' => 'Order does not exist'
+        ],
+        'cancel' => [
+            'params_wrong' => 'Invalid parameter',
+            'order_not_exist' => 'Order does not exist',
+            'only_cancel_pending_order' => 'You can only cancel pending orders',
+            'cancel_failed' => 'Cancel failed',
+        ],
+        'stripeAlipay' => [
+            'currency_convert_timeout' => 'Currency conversion has timed out, please try again later',
+            'gateway_request_failed' => 'Payment gateway request failed',
+        ],
+        'stripeWepay' => [
+            'currency_convert_timeout' => 'Currency conversion has timed out, please try again later',
+            'gateway_request_failed' => 'Payment gateway request failed',
+        ],
+        'stripeCard' => [
+            'currency_convert_timeout' => 'Currency conversion has timed out, please try again later',
+            'was_problem' => 'Oops, there's a problem... Please refresh the page and try again later',
+            'deduction_failed' => 'Payment failed. Please check your credit card information'
+        ]
+    ],
+    'knowledge' => [
+        'fetch' => [
+            'knowledge_not_exist' => 'Article does not exist',
+            'apple_id_must_be_plan' => 'No active subscription. Unable to use our provided Apple ID'
+        ]
+    ],
+    'invite' => [
+        'save' => [
+            'invite_create_limit' => 'The maximum number of creations has been reached'
+        ]
+    ],
+    'coupon' => [
+        'check' => [
+            'coupon_not_empty' => 'Coupon cannot be empty',
+            'coupon_invalid' => 'Invalid coupon',
+            'coupon_not_available_by_number' => 'This coupon is no longer available',
+            'coupon_not_available_by_time' => 'This coupon has not yet started',
+            'coupon_expired' => 'This coupon has expired',
+            'coupon_limit_plan' => 'The coupon code cannot be used for this subscription'
+        ]
+    ]
+];

resources/lang/zh-CN/passport.php

@@ -5,7 +5,7 @@ return [
         'register' => [
             'verify_incorrect' => '验证码有误',
             'email_suffix_not_in_whitelist' => '邮箱后缀不处于白名单中',
-            'no_support_gmail_alias' => '不支持Gmail别名邮箱',
+            'no_support_gmail_alias' => '不支持 Gmail 别名邮箱',
             'close_register' => '本站已关闭注册',
             'must_use_invite_code' => '必须使用邀请码才可以注册',
             'email_code_not_empty' => '邮箱验证码不能为空',
@@ -29,7 +29,7 @@ return [
     ],
     'comm' => [
         'sendEmailVerify' => [
-            'verification_code_incorrect.' => '验证码有误',
+            'verification_code_incorrect' => '验证码有误',
             'code_sent_request_later' => '验证码已发送，请过一会再请求',
             'email_verification_code' => '邮箱验证码'
         ]

resources/lang/zh-CN/user.php

@@ -34,7 +34,7 @@ return [
             'ticket_not_exist' => '工单不存在',
         ],
         'save' => [
-            'exist_other_open_ticket' => '存在其他工单尚未处理',
+            'exist_other_open_ticket' => '存在其它工单尚未处理',
             'ticket_create_failed' => '工单创建失败',
         ],
         'reply' => [
@@ -52,8 +52,8 @@ return [
         ],
         'withdraw' => [
             'not_support_withdraw_method' => '不支持的提现方式',
-            'system_require_withdraw_limit' => '当前系统要求的提现门槛佣金需为:limitCNY',
-            'ticket_subject' => '[提现申请]本工单由系统发出',
+            'system_require_withdraw_limit' => '当前系统要求的最少提现佣金为：¥:limitCNY',
+            'ticket_subject' => '[提现申请] 本工单由系统发出',
             'ticket_create_failed' => '工单创建失败',
             'ticket_message' => "提现方式：:method\r\n提现账号：:account\r\n"
         ]
@@ -70,12 +70,12 @@ return [
         ],
         'save' => [
             'plan_not_exist' => '订阅计划不存在',
-            'exist_open_order' => '您有未付款或开通中的订单，请稍后或取消再试',
-            'plan_stop_sell' => '该订阅已售罄，请更换其他订阅',
-            'plan_stop_renew' => '该订阅无法续费，请更换其他订阅',
-            'plan_stop' => '该订阅周期无法进行购买，请选择其他周期',
+            'exist_open_order' => '您有未付款或开通中的订单，请稍后再试或将其取消',
+            'plan_stop_sell' => '该订阅已售罄，请更换其它订阅',
+            'plan_stop_renew' => '该订阅无法续费，请更换其它订阅',
+            'plan_stop' => '该订阅周期无法进行购买，请选择其它周期',
             'plan_exist_not_buy_package' => '订阅已过期或无有效订阅，无法购买重置包',
-            'plan_expired' => '订阅已过期，请更换其他订阅',
+            'plan_expired' => '订阅已过期，请更换其它订阅',
             'coupon_use_failed' => '优惠券使用失败',
             'insufficient_balance' => '余额不足',
             'order_create_failed' => '订单创建失败'
@@ -109,8 +109,8 @@ return [
     ],
     'knowledge' => [
         'fetch' => [
-            'knowledge_not_exist' => '知识不存在',
-            'apple_id_must_be_plan' => '没有有效订阅无法使用本站提供的AppleID'
+            'knowledge_not_exist' => '文章不存在',
+            'apple_id_must_be_plan' => '无有效订阅，无法使用本站提供的 AppleID'
         ]
     ],
     'invite' => [
@@ -120,12 +120,12 @@ return [
     ],
     'coupon' => [
         'check' => [
-            'coupon_not_empty' => '优惠券码不能为空',
+            'coupon_not_empty' => '优惠券不能为空',
             'coupon_invalid' => '优惠券无效',
             'coupon_not_available_by_number' => '优惠券已无可用次数',
             'coupon_not_available_by_time' => '优惠券还未到可用时间',
             'coupon_expired' => '优惠券已过期',
-            'coupon_limit_plan' => '这个计划无法使用该优惠码'
+            'coupon_limit_plan' => '该订阅无法使用此优惠码'
         ]
     ]
 ];