t

backendApi/modules/v1/controllers/AdminController.php

@@ -75,7 +75,7 @@ class AdminController extends BaseController
      */
     public function actionAdd(){
         if(Yii::$app->request->isPost) {
-            return parent::edit(AdminForm::class, '管理员添加成功', null, null, null, function($formModel, $result){
+            return parent::edit(AdminForm::class, Yii::t('ctx', 'AdminAddedSuccessfully'), null, null, null, function($formModel, $result){
                 // 添加操作日志
                 // Log::adminHandle('添加管理员:'.$result->ADMIN_NAME);
             });
@@ -94,7 +94,7 @@ class AdminController extends BaseController
     public function actionEdit(){
         $id = Yii::$app->request->get('id');
         if(Yii::$app->request->isPost){
-            return parent::edit(AdminForm::class, '管理员编辑成功', null, null, null, function($formModel, $result){
+            return parent::edit(AdminForm::class, Yii::t('ctx', 'AdminEditedSuccessfully'), null, null, null, function($formModel, $result){
                 // 添加操作日志
                 // Log::adminHandle('编辑管理员:'.$result->ADMIN_NAME);
             });
@@ -116,7 +116,7 @@ class AdminController extends BaseController
         $form->scenario = 'changePassword';
         if(Yii::$app->request->isPost && $form->load(Yii::$app->request->post(), '') && $result = $form->edit()){
             // Log::adminHandle('管理员'.$result->ADMIN_NAME.'重置密码');
-            return static::notice('Password change succeeded'); // 重置密码成功
+            return static::notice(Yii::t('ctx', 'passwordChangeSucceeded')); // 重置密码成功
         } else {
             return static::notice(Form::formatErrorsForApi($form->getErrors()), 400);
         }
@@ -180,7 +180,7 @@ class AdminController extends BaseController
             $formModel = new AdminRoleForm();
             $formModel->scenario = 'add';
             if ($formModel->load(Yii::$app->request->post(), '') && $formModel->add()) {
-                return static::notice('添加管理员角色成功');
+                return static::notice(Yii::t('ctx', 'successAddAdminRole'));
             } else {
                 return static::notice(Form::formatErrorsForApi($formModel->getErrors()), 400);
             }
@@ -195,13 +195,13 @@ class AdminController extends BaseController
     public function actionRoleEdit(){
         $id = Yii::$app->request->get('id');
         if (Yii::$app->request->isPost) {
-            return parent::edit(AdminRoleForm::class, '编辑管理员角色成功', 'edit', ['edit'], null, function ($form, $result) {
+            return parent::edit(AdminRoleForm::class, Yii::t('ctx', 'editAdminRoleSuccess'), 'edit', ['edit'], null, function ($form, $result) {
                 Cache::updateAdminRole();
             });
         }
         // 获得当前会员的用户名等信息
         if (!$role = AdminRole::findOneAsArray('ID=:ID', [':ID' => $id], 'ROLE_NAME,REMARK')) {
-            return static::notice('角色不存在', 404);
+            return static::notice(Yii::t('ctx', 'roleDoesNotExist'), 404);
         }
         return static::notice($role);
     }
@@ -236,7 +236,7 @@ class AdminController extends BaseController
         $oneAdminRole = AdminRole::findOne($id);
 
         if (Yii::$app->request->isPost) {
-            return parent::edit(AdminRoleForm::class, '设置管理员角色权限成功', 'permission', ['permission'], null, function ($form, $result) {
+            return parent::edit(AdminRoleForm::class, Yii::t('ctx', 'successSetAdminRolePermissions'), 'permission', ['permission'], null, function ($form, $result) {
                 Cache::updateAdminRole();
             });
         }
@@ -310,7 +310,7 @@ class AdminController extends BaseController
         $id = Yii::$app->request->get('id');
 
         if (Yii::$app->request->isPost) {
-            return parent::edit(AdminRoleForm::class, '设置管理员角色列表字段权限成功', 'columnPermission', ['columnPermission'], null, function ($form, $result) {
+            return parent::edit(AdminRoleForm::class, Yii::t('ctx', 'successSetAdminRoleListFieldPermissions'), 'columnPermission', ['columnPermission'], null, function ($form, $result) {
                 Cache::updateAdminRole();
             });
         }
@@ -334,6 +334,4 @@ class AdminController extends BaseController
 
         return $allRoleColumns;
     }
-
-
 }

backendApi/modules/v1/models/AdminForm.php

@@ -40,7 +40,7 @@ class AdminForm extends Model
             [['password', 'surePassword'], 'required', 'on'=>['add', 'changePassword', 'noLoginModifyPassword']],
             [['adminName', 'oldPassword'], 'required', 'on'=>['noLoginModifyPassword']],
             [['adminName'], 'unique', 'targetClass'=>Admin::class, 'targetAttribute'=>'ADMIN_NAME', 'on'=>['add']],
-            ['surePassword', 'compare', 'compareAttribute'=>'password', 'message' => 'The two passwords must be the same'], // 两次密码必须一致
+            ['surePassword', 'compare', 'compareAttribute'=>'password', 'message' => \Yii::t('ctx', 'twoPasswordsMustSame')], // 两次密码必须一致
         ];
     }
 
@@ -114,20 +114,20 @@ class AdminForm extends Model
         } elseif($this->scenario == 'noLoginModifyPassword') {
             $model =  Admin::findOne(["ADMIN_NAME"=>$this->adminName]);
             if( !$model ) {
-                $this->addError('noLoginModifyPassword', 'The member name does not exist'); // 不存在的用户名
+                $this->addError('noLoginModifyPassword', \Yii::t('ctx', 'memberNameDoesNotExist')); // 不存在的用户名
                 return null;
             }
             if( $this->oldPassword === $this->password ) {
-                $this->addError('noLoginModifyPassword', 'The login password has not changed'); // 登录密码没有发生改变
+                $this->addError('noLoginModifyPassword', \Yii::t('ctx', 'loginPasswordHasNotChanged')); // 登录密码没有发生改变
                 return null;
             }
             if ( !$model->validatePassword($this->oldPassword) ) {
-                $this->addError('noLoginModifyPassword', 'The old login password is incorrect'); // 原登录密码错误
+                $this->addError('noLoginModifyPassword', \Yii::t('ctx', 'oldLoginPasswordIncorrect')); // 原登录密码错误
                 return null;
             }
             $model->IS_MODIFY_PASSWORD = 0;
         }else {
-            $this->addError('id', 'The submission does not exist'); // 提交场景不存在
+            $this->addError('id', \Yii::t('ctx', 'submissionDoesNotExist')); // 提交场景不存在
             return null;
         }
 
@@ -135,7 +135,7 @@ class AdminForm extends Model
         if($this->password){
             if ($this->scenario == 'changePassword' || $this->scenario == 'noLoginModifyPassword'){
                 if (strlen($this->password) < 8){
-                    $this->addError($this->scenario, 'The password must contain at least eight characters'); // 登录密码不能小于8位
+                    $this->addError($this->scenario, \Yii::t('ctx', 'passwordLeastEightCharacters')); // 登录密码不能小于8位
                     return null;
                 }
 //               $symbol = '!#$%^&*';
@@ -143,7 +143,7 @@ class AdminForm extends Model
                $passwordRules = '/^(?![\d]+$)(?![a-z]+$)(?![A-Z]+$)(?!['.$symbol.']+$)[\da-zA-z'.$symbol.']{8,}$/';
                $verificationResults = preg_match($passwordRules,$this->password);
                if (!$verificationResults){
-                   $this->addError($this->scenario, 'The password must contain at least two types of digits, capital letters, small letters and special characters'); // 登录密码中需要包含数字、大写字母、小写字母、特殊字符至少两种
+                   $this->addError($this->scenario, \Yii::t('ctx', 'passwordRule')); // 登录密码中需要包含数字、大写字母、小写字母、特殊字符至少两种
                    return null;
                }
             }
@@ -196,7 +196,7 @@ class AdminForm extends Model
     public function beforeDelete($selected) {
         foreach ($selected as $value){
             if($value==\Yii::$app->user->id){
-                throw new \Exception('无法删除自己');
+                throw new \Exception(\Yii::t('ctx', 'unableToDeleteOneSelf'));
             }
         }
         $this->adminOperateLogger->setIsBatch(true)->beforeDelete($selected, 'ID');

backendApi/modules/v1/models/AdminRoleForm.php

@@ -172,7 +172,7 @@ class AdminRoleForm extends Model
         $this->adminOperateLogger->setIsBatch(true)->beforeDelete($selected, 'ID');
         foreach ($selected as $id) {
             if(Admin::find()->where('ROLE_ID=:ROLE_ID',[':ROLE_ID'=>$id])->exists()){
-                throw new \Exception('所选角色下有管理员不得删除');
+                throw new \Exception(\Yii::t('ctx', 'adminUnderSelectedRoleCannotDeleted'));
             }
         }
     }
@@ -186,5 +186,4 @@ class AdminRoleForm extends Model
             'optType' => '删除管理员角色',
         ]);
     }
-
 }

common/messages/en-US/ctx.php

@@ -1,6 +1,34 @@
 <?php
 return [
+    #Admin
+    'AdminAddedSuccessfully' => 'Administrator added successfully',
+    'AdminEditedSuccessfully' => 'Administrator edited successfully',
+    'passwordChangeSucceeded' => 'Password change succeeded',
+    'successAddAdminRole' => 'Successfully added the administrator role',
+    'editAdminRoleSuccess' => 'Edit administrator role succeeded',
+    'roleDoesNotExist' => 'Role does not exist',
+    'successSetAdminRolePermissions' => 'Successfully set administrator role permissions',
+    'successSetAdminRoleListFieldPermissions' => 'Successfully set administrator role list field permissions',
+    'adminUnderSelectedRoleCannotDeleted' => 'Administrators under the selected role cannot be deleted',
+    'twoPasswordsMustSame' => 'The two passwords must be the same',
+    'memberNameDoesNotExist' => 'The member name does not exist',
+    'loginPasswordHasNotChanged' => 'The login password has not changed',
+    'oldLoginPasswordIncorrect' => 'The old login password is incorrect',
+    'submissionDoesNotExist' => 'The submission does not exist',
+    'passwordLeastEightCharacters' => 'The password must contain at least eight characters',
+    'passwordRule' => 'The password must contain at least two types of digits, capital letters, small letters and special characters',
+    'unableToDeleteOneSelf' => 'Unable to delete oneself',
+
     #Finance
+    // 系统功能
+    'commonModelsWithdrawStatusNameStatusApplied' => 'Applied',
+    'commonModelsWithdrawStatusNameStatusAudited' => 'Withdrawal has been reviewed',
+    'commonModelsWithdrawStatusNameStatusWaitPaid' => 'Unpaid',
+    'commonModelsWithdrawStatusNameStatusPaidFalse' => 'Failed',
+    'commonModelsWithdrawStatusNameStatusRefused' => 'Refused',
+    'commonModelsWithdrawStatusNameStatusPaid' => 'Withdrawal has been paid',
+    'commonModelsWithdrawStatusNameStatusReturned' => 'Returned',
+
     'memberEcoinAdjustmentListFileName'=> 'Member_Ecoin_adjustment_list',
     'applicationChangeBalanceSucceeded'=> 'Application for change of member balance succeeded',
     'applicationCannotReviewedAgain'=> 'The application has been reviewed and cannot be reviewed again',
@@ -331,7 +359,7 @@ return [
 
     # 登录
     'refreshTokenFailed' => 'refresh token failed',
-    'passwordChangeSucceeded' => 'Password change succeeded',
+    
     'accountDoesNotExist' => 'The account does not exist',
     'memberNameOrPasswordIncorrect' => 'The member name or password is incorrect',
     'abnormalMemberCode' => 'Abnormal member code',

common/messages/zh-CN/ctx.php

@@ -1,6 +1,34 @@
 <?php
 return [
+    #Admin
+    'AdminAddedSuccessfully' => '管理员添加成功',
+    'AdminEditedSuccessfully' => '管理员编辑成功',
+    'passwordChangeSucceeded' => '密码修改成功',
+    'successAddAdminRole' => '添加管理员角色成功',
+    'editAdminRoleSuccess' => '编辑管理员角色成功',
+    'roleDoesNotExist' => '角色不存在',
+    'successSetAdminRolePermissions' => '设置管理员角色权限成功',
+    'successSetAdminRoleListFieldPermissions' => '设置管理员角色列表字段权限成功',
+    'adminUnderSelectedRoleCannotDeleted' => '所选角色下有管理员不得删除',
+    'twoPasswordsMustSame' => '两次密码必须一致',
+    'memberNameDoesNotExist' => '不存在的用户名',
+    'loginPasswordHasNotChanged' => '登录密码没有发生改变',
+    'oldLoginPasswordIncorrect' => '原登录密码错误',
+    'submissionDoesNotExist' => '提交场景不存在',
+    'passwordLeastEightCharacters' => '登录密码不能小于8位',
+    'passwordRule' => '登录密码中需要包含数字、大写字母、小写字母、特殊字符至少两种',
+    'unableToDeleteOneSelf' => '无法删除自己',
+
     #Finance
+    // 系统功能
+    'commonModelsWithdrawStatusNameStatusApplied' => '提现待审核',
+    'commonModelsWithdrawStatusNameStatusAudited' => '提现已审核',
+    'commonModelsWithdrawStatusNameStatusWaitPaid' => '提现待付款',
+    'commonModelsWithdrawStatusNameStatusPaidFalse' => '付款失败',
+    'commonModelsWithdrawStatusNameStatusRefused' => '已拒绝',
+    'commonModelsWithdrawStatusNameStatusPaid' => '提现已付款',
+    'commonModelsWithdrawStatusNameStatusReturned' => '已退回',
+
     'memberEcoinAdjustmentListFileName'=> '会员余额调整列表',
     'applicationChangeBalanceSucceeded'=> '申请变动会员余额成功',
     'applicationCannotReviewedAgain'=> '该申请已经被审核，不能重复审核',
@@ -341,7 +369,7 @@ return [
 
     # 登录
     'refreshTokenFailed' => '刷新token失败',
-    'passwordChangeSucceeded' => '密码修改成功',
+    
     'wrongTransactionType' => '错误的交易类型',
     'accountDoesNotExist' => '账号不存在',
     'memberNameOrPasswordIncorrect' => '用户名或密码错误',

common/models/Withdraw.php

@@ -66,14 +66,14 @@ class Withdraw extends \common\components\ActiveRecord {
     const STATUS_RETURN = 7;        // 提现退回
 
     const STATUS_NAME = [
-        self::STATUS_APPLIED => 'Applied', // 提现待审核
+        self::STATUS_APPLIED => Yii::t('ctx', 'commonModelsWithdrawStatusNameStatusApplied'), // 提现待审核
 //        self::STATUS_INVOICED => '提现待审核',
-        self::STATUS_AUDITED => 'Withdrawal has been reviewed', // 提现已审核
-        self::STATUS_WAIT_PAID => 'Unpaid', // 提现待付款
-        self::STATUS_PAID_FALSE => 'Failed', // 付款失败
-        self::STATUS_REFUSED => 'Refused', // 已拒绝
-        self::STATUS_PAID => 'Withdrawal has been paid', // 提现已付款
-        self::STATUS_RETURN => 'Returned',
+        self::STATUS_AUDITED => Yii::t('ctx', 'commonModelsWithdrawStatusNameStatusAudited'), // 提现已审核 
+        self::STATUS_WAIT_PAID => Yii::t('ctx', 'commonModelsWithdrawStatusNameStatusWaitPaid'), // 提现待付款 
+        self::STATUS_PAID_FALSE => Yii::t('ctx', 'commonModelsWithdrawStatusNameStatusPaidFalse'), // 付款失败  
+        self::STATUS_REFUSED => Yii::t('ctx', 'commonModelsWithdrawStatusNameStatusRefused'), // 已拒绝 
+        self::STATUS_PAID => Yii::t('ctx', 'commonModelsWithdrawStatusNameStatusPaid'), // 提现已付款 
+        self::STATUS_RETURN => Yii::t('ctx', 'commonModelsWithdrawStatusNameStatusReturned'), // 已退回
     ];
 
     /**