Bladeren bron

后台多语言翻译

joway 2 jaren geleden
bovenliggende
commit
952b142aff
100 gewijzigde bestanden met toevoegingen van 46 en 14 verwijderingen
  1. 1 0
      .gitignore
  2. 0 0
      LICENSE.md
  3. 0 0
      README.md
  4. 0 0
      REGION_insert.sql
  5. 0 0
      Vagrantfile
  6. 0 0
      ak-upload-server/ar.upload.ming.conf
  7. 0 0
      ak-upload-server/auth.dev.lua
  8. 0 0
      ak-upload-server/auth.prod.lua
  9. 0 0
      ak-upload-server/server.dev.py
  10. 0 0
      ak-upload-server/server.prod.py
  11. 0 0
      ak-upload-server/token.php
  12. 0 0
      ak-upload-server/upload.py
  13. 0 0
      ak-upload-server/upload_img_filter.conf
  14. 0 0
      ak-upload-server/upload_img_filter.dev.conf
  15. 0 0
      ak-upload-server/upload_img_filter.prod.conf
  16. 0 0
      ak-upload-server/venv/bin/activate
  17. 0 0
      ak-upload-server/venv/bin/activate.csh
  18. 0 0
      ak-upload-server/venv/bin/activate.fish
  19. 0 0
      ak-upload-server/venv/bin/easy_install
  20. 0 0
      ak-upload-server/venv/bin/easy_install-3.6
  21. 0 0
      ak-upload-server/venv/bin/pip
  22. 0 0
      ak-upload-server/venv/bin/pip3
  23. 0 0
      ak-upload-server/venv/bin/pip3.6
  24. 0 0
      ak-upload-server/venv/bin/python
  25. 0 0
      ak-upload-server/venv/bin/python3
  26. 0 0
      ak-upload-server/venv/bin/python3.6
  27. 0 0
      ak-upload-server/venv/lib/python3.6/site-packages/easy-install.pth
  28. 0 0
      ak-upload-server/venv/lib/python3.6/site-packages/setuptools-28.8.0-py3.6.egg
  29. 0 0
      ak-upload-server/venv/lib/python3.6/site-packages/setuptools.pth
  30. 0 0
      ak-upload-server/venv/pyvenv.cfg
  31. 0 0
      backend/assets/AppAsset.php
  32. 0 0
      backend/codeception.yml
  33. 0 0
      backend/config/.gitignore
  34. 0 0
      backend/config/bootstrap.php
  35. 0 0
      backend/config/main-local.php
  36. 0 0
      backend/config/main.php
  37. 0 0
      backend/config/params.php
  38. 0 0
      backend/config/test.php
  39. 0 0
      backend/controllers/SiteController.php
  40. 0 0
      backend/controllers/TestController.php
  41. 0 0
      backend/models/.gitkeep
  42. 0 0
      backend/runtime/.gitignore
  43. 0 0
      backend/tests/_bootstrap.php
  44. 0 0
      backend/tests/_data/.gitignore
  45. 0 0
      backend/tests/_data/login_data.php
  46. 0 0
      backend/tests/_output/.gitignore
  47. 0 0
      backend/tests/_support/.gitignore
  48. 0 0
      backend/tests/_support/FunctionalTester.php
  49. 0 0
      backend/tests/_support/UnitTester.php
  50. 0 0
      backend/tests/functional.suite.yml
  51. 0 0
      backend/tests/functional/LoginCest.php
  52. 0 0
      backend/tests/functional/_bootstrap.php
  53. 0 0
      backend/tests/unit.suite.yml
  54. 0 0
      backend/tests/unit/_bootstrap.php
  55. 0 0
      backend/views/layouts/main.php
  56. 0 0
      backend/views/site/addDecTest.php
  57. 0 0
      backend/views/site/error.php
  58. 0 0
      backend/views/site/index.php
  59. 0 0
      backend/views/site/login.php
  60. 0 0
      backend/web/.gitignore
  61. 0 0
      backend/web/assets/.gitignore
  62. 0 0
      backend/web/css/site.css
  63. 0 0
      backend/web/favicon.ico
  64. 0 0
      backend/web/index.php
  65. 0 0
      backend/web/robots.txt
  66. 0 0
      backend/web/test.php
  67. 0 0
      backendApi/config/bootstrap.php
  68. 0 0
      backendApi/config/main.php
  69. 0 0
      backendApi/config/menu.php
  70. 0 0
      backendApi/config/params.php
  71. 0 0
      backendApi/config/urlManagerRules.php
  72. 0 0
      backendApi/modules/v1/Module.php
  73. 0 0
      backendApi/modules/v1/components/UserAuth.php
  74. 0 0
      backendApi/modules/v1/controllers/AdController.php
  75. 0 0
      backendApi/modules/v1/controllers/AdminController.php
  76. 0 0
      backendApi/modules/v1/controllers/ArticleController.php
  77. 0 0
      backendApi/modules/v1/controllers/AtlasController.php
  78. 5 4
      backendApi/modules/v1/controllers/BaseController.php
  79. 7 8
      backendApi/modules/v1/controllers/BonusController.php
  80. 0 0
      backendApi/modules/v1/controllers/CalcController.php
  81. 0 0
      backendApi/modules/v1/controllers/ConfigController.php
  82. 0 0
      backendApi/modules/v1/controllers/DashboardController.php
  83. 33 2
      backendApi/modules/v1/controllers/FileController.php
  84. 0 0
      backendApi/modules/v1/controllers/FinanceController.php
  85. 0 0
      backendApi/modules/v1/controllers/LogController.php
  86. 0 0
      backendApi/modules/v1/controllers/MessageController.php
  87. 0 0
      backendApi/modules/v1/controllers/OauthController.php
  88. 0 0
      backendApi/modules/v1/controllers/ReconsumeController.php
  89. 0 0
      backendApi/modules/v1/controllers/ReportController.php
  90. 0 0
      backendApi/modules/v1/controllers/ShopController.php
  91. 0 0
      backendApi/modules/v1/controllers/SiteController.php
  92. 0 0
      backendApi/modules/v1/controllers/UserController.php
  93. 0 0
      backendApi/modules/v1/models/Admin.php
  94. 0 0
      backendApi/modules/v1/models/AdminForm.php
  95. 0 0
      backendApi/modules/v1/models/AdminRole.php
  96. 0 0
      backendApi/modules/v1/models/AdminRoleForm.php
  97. 0 0
      backendApi/modules/v1/models/AdminToken.php
  98. 0 0
      backendApi/modules/v1/models/LoginForm.php
  99. 0 0
      backendApi/modules/v1/models/User.php
  100. 0 0
      backendApi/modules/v1/models/exportForms/AtlasExportForm.php

+ 1 - 0
.gitignore

@@ -14,6 +14,7 @@ Desktop.ini
 .idea
 */.idea
 /.idea/*
+node_modules
 
 .vscode
 

+ 0 - 0
LICENSE.md


+ 0 - 0
README.md


+ 0 - 0
REGION_insert.sql


+ 0 - 0
Vagrantfile


+ 0 - 0
ak-upload-server/ar.upload.ming.conf


+ 0 - 0
ak-upload-server/auth.dev.lua


+ 0 - 0
ak-upload-server/auth.prod.lua


+ 0 - 0
ak-upload-server/server.dev.py


+ 0 - 0
ak-upload-server/server.prod.py


+ 0 - 0
ak-upload-server/token.php


+ 0 - 0
ak-upload-server/upload.py


+ 0 - 0
ak-upload-server/upload_img_filter.conf


+ 0 - 0
ak-upload-server/upload_img_filter.dev.conf


+ 0 - 0
ak-upload-server/upload_img_filter.prod.conf


+ 0 - 0
ak-upload-server/venv/bin/activate


+ 0 - 0
ak-upload-server/venv/bin/activate.csh


+ 0 - 0
ak-upload-server/venv/bin/activate.fish


+ 0 - 0
ak-upload-server/venv/bin/easy_install


+ 0 - 0
ak-upload-server/venv/bin/easy_install-3.6


+ 0 - 0
ak-upload-server/venv/bin/pip


+ 0 - 0
ak-upload-server/venv/bin/pip3


+ 0 - 0
ak-upload-server/venv/bin/pip3.6


+ 0 - 0
ak-upload-server/venv/bin/python


+ 0 - 0
ak-upload-server/venv/bin/python3


+ 0 - 0
ak-upload-server/venv/bin/python3.6


+ 0 - 0
ak-upload-server/venv/lib/python3.6/site-packages/easy-install.pth


+ 0 - 0
ak-upload-server/venv/lib/python3.6/site-packages/setuptools-28.8.0-py3.6.egg


+ 0 - 0
ak-upload-server/venv/lib/python3.6/site-packages/setuptools.pth


+ 0 - 0
ak-upload-server/venv/pyvenv.cfg


+ 0 - 0
backend/assets/AppAsset.php


+ 0 - 0
backend/codeception.yml


+ 0 - 0
backend/config/.gitignore


+ 0 - 0
backend/config/bootstrap.php


+ 0 - 0
backend/config/main-local.php


+ 0 - 0
backend/config/main.php


+ 0 - 0
backend/config/params.php


+ 0 - 0
backend/config/test.php


+ 0 - 0
backend/controllers/SiteController.php


+ 0 - 0
backend/controllers/TestController.php


+ 0 - 0
backend/models/.gitkeep


+ 0 - 0
backend/runtime/.gitignore


+ 0 - 0
backend/tests/_bootstrap.php


+ 0 - 0
backend/tests/_data/.gitignore


+ 0 - 0
backend/tests/_data/login_data.php


+ 0 - 0
backend/tests/_output/.gitignore


+ 0 - 0
backend/tests/_support/.gitignore


+ 0 - 0
backend/tests/_support/FunctionalTester.php


+ 0 - 0
backend/tests/_support/UnitTester.php


+ 0 - 0
backend/tests/functional.suite.yml


+ 0 - 0
backend/tests/functional/LoginCest.php


+ 0 - 0
backend/tests/functional/_bootstrap.php


+ 0 - 0
backend/tests/unit.suite.yml


+ 0 - 0
backend/tests/unit/_bootstrap.php


+ 0 - 0
backend/views/layouts/main.php


+ 0 - 0
backend/views/site/addDecTest.php


+ 0 - 0
backend/views/site/error.php


+ 0 - 0
backend/views/site/index.php


+ 0 - 0
backend/views/site/login.php


+ 0 - 0
backend/web/.gitignore


+ 0 - 0
backend/web/assets/.gitignore


+ 0 - 0
backend/web/css/site.css


+ 0 - 0
backend/web/favicon.ico


+ 0 - 0
backend/web/index.php


+ 0 - 0
backend/web/robots.txt


+ 0 - 0
backend/web/test.php


+ 0 - 0
backendApi/config/bootstrap.php


+ 0 - 0
backendApi/config/main.php


+ 0 - 0
backendApi/config/menu.php


+ 0 - 0
backendApi/config/params.php


+ 0 - 0
backendApi/config/urlManagerRules.php


+ 0 - 0
backendApi/modules/v1/Module.php


+ 0 - 0
backendApi/modules/v1/components/UserAuth.php


+ 0 - 0
backendApi/modules/v1/controllers/AdController.php


+ 0 - 0
backendApi/modules/v1/controllers/AdminController.php


+ 0 - 0
backendApi/modules/v1/controllers/ArticleController.php


+ 0 - 0
backendApi/modules/v1/controllers/AtlasController.php


+ 5 - 4
backendApi/modules/v1/controllers/BaseController.php

@@ -143,7 +143,7 @@ class BaseController extends \yii\rest\ActiveController {
             $selected = \Yii::$app->request->post('selected');
         }
         if (!$selected) {
-            return self::notice('must select one item to hide', 500); // 必须选择一条删除数据
+            return self::notice( Yii::t('ctx', 'mustSelectOneItemToDelete'), 500); // 必须选择一条删除数据
         }
         if (is_array($selected)) {
             $condition = ['AND', ['IN', 'ID', $selected]];
@@ -167,7 +167,8 @@ class BaseController extends \yii\rest\ActiveController {
             }
             if ($afterFun) $afterFun($selected);
             $transaction->commit();
-            return self::notice($stateStr.' successfully'); // 隐藏/取消隐藏 成功
+
+            return self::notice(Yii::t('ctx', $stateStr.'Successfully')); // 隐藏/取消隐藏 成功
         } catch (Exception $e) {
             $transaction->rollBack();
             return self::notice($e->getMessage(), 500);
@@ -226,7 +227,7 @@ class BaseController extends \yii\rest\ActiveController {
             if ($isDelData) {
                 // 真实删除数据
                 if (!$modelClass::deleteAll($condition, $params)) {
-                    throw new Exception(Yii::t('ctx', 'deleteFailed'));//删除失败 
+                    throw new Exception(Yii::t('ctx', 'deleteFailed'));//删除失败
                 }
             } else {
                 // 设置IS_DEL字段为1
@@ -453,4 +454,4 @@ class BaseController extends \yii\rest\ActiveController {
             'request' => $request,
         ];
     }
-}
+}

+ 7 - 8
backendApi/modules/v1/controllers/BonusController.php

@@ -352,7 +352,7 @@ class BonusController extends BaseController {
 
 
     /**
-     * 会员余额流水 
+     * 会员余额流水
      * @return mixed
      * @throws \yii\base\Exception
      * @throws HttpException
@@ -847,9 +847,8 @@ class BonusController extends BaseController {
         }
         $data = $this->_periodBonus($periodNum,false);
         if( isset($data['filterTypes']) && is_array($data['filterTypes']) ) {
-            $data['filterTypes'] = array_merge(['periodNum'=>['isUserTable'=> false, 'name'=> 'Pay Cycle(PC)']], $data['filterTypes']);
+            $data['filterTypes'] = array_merge(['periodNum'=>['isUserTable'=> false, 'name'=> \Yii::t('ctx', 'payCycle')]], $data['filterTypes']);
         }
-
         return static::notice($data);
     }
 
@@ -921,7 +920,7 @@ class BonusController extends BaseController {
     public function actionOtherPeriodBonusFilterTypes(){
         $listObj = new PeriodBonusList();
         $filterTypes = $listObj->getFilterTypes();
-        $filterTypes = array_merge(['periodNum'=>['isUserTable'=> false, 'name'=> '结算期数']], $filterTypes);
+        $filterTypes = array_merge(['periodNum'=>['isUserTable'=> false, 'name'=> \Yii::t('ctx', 'payCycle')]], $filterTypes);
         return static::notice($filterTypes);
     }
 
@@ -997,9 +996,9 @@ class BonusController extends BaseController {
      */
     public function actionTraceDownQy() {
         $periodNum = Yii::$app->request->get('periodNum');
-        if (!$periodNum) return static::notice('请填写期数', 400);
+        if (!$periodNum) return static::notice(\Yii::t('ctx', 'requirePeriods'), 400);
         $userName = Yii::$app->request->get('userName');
-        if (!$userName) return static::notice('请填写会员编号', 400);
+        if (!$userName) return static::notice(\Yii::t('ctx', 'requireMemberNumber'), 400);
         $period = Period::instance();
         if (!$period->isCalculated($periodNum)) {
             return static::notice([]);
@@ -1989,7 +1988,7 @@ class BonusController extends BaseController {
     }
 
     /**
-     * 区域津贴补发列表导出 
+     * 区域津贴补发列表导出
      * @return mixed
      * @throws \yii\db\Exception
      * @throws HttpException
@@ -2842,4 +2841,4 @@ class BonusController extends BaseController {
             return static::notice('Illegal request', 400); // 非法请求
         }
     }
-}
+}

+ 0 - 0
backendApi/modules/v1/controllers/CalcController.php


+ 0 - 0
backendApi/modules/v1/controllers/ConfigController.php


+ 0 - 0
backendApi/modules/v1/controllers/DashboardController.php


+ 33 - 2
backendApi/modules/v1/controllers/FileController.php

@@ -69,10 +69,41 @@ class FileController extends BaseController
             }
         }
         // 全部模块
-        $data['allModuleName'] = Yii::$app->params['exportModule'];
+        //$data['allModuleName'] = Yii::$app->params['exportModule'];
+        $data['allModuleName'] = $this->returnAllModuleNameTranslate(Yii::$app->params['exportModule']);
         return static::notice($data);
     }
 
+    /**
+     *  多语言
+     */
+    public function returnAllModuleNameTranslate($allModuleName = []){
+        foreach($allModuleName as $k=>$v){
+            switch ($k)
+            {
+                case 'shop':
+                    $allModuleName[$k]['label'] = \Yii::t('ctx', 'mallManagement');
+                    break;
+                case 'user':
+                    $allModuleName[$k]['label'] = Yii::t('ctx', 'memberManagement');
+                    break;
+                case 'atlas':
+                    $allModuleName[$k]['label'] = Yii::t('ctx', 'networkChart');
+                    break;
+                case 'reconsume':
+                    $allModuleName[$k]['label'] = Yii::t('ctx', 'resaleManagement');
+                    break;
+                case 'bonus':
+                    $allModuleName[$k]['label'] = Yii::t('ctx', 'bonusManagement');
+                    break;
+                case 'finance':
+                    $allModuleName[$k]['label'] = Yii::t('ctx', 'financialManagement');
+                    break;
+            }
+        }
+        return $allModuleName;
+    }
+
     /**
      * 删除已导出文件
      * @return mixed
@@ -140,4 +171,4 @@ class FileController extends BaseController
         }
     }
 
-}
+}

+ 0 - 0
backendApi/modules/v1/controllers/FinanceController.php


+ 0 - 0
backendApi/modules/v1/controllers/LogController.php


+ 0 - 0
backendApi/modules/v1/controllers/MessageController.php


+ 0 - 0
backendApi/modules/v1/controllers/OauthController.php


+ 0 - 0
backendApi/modules/v1/controllers/ReconsumeController.php


+ 0 - 0
backendApi/modules/v1/controllers/ReportController.php


+ 0 - 0
backendApi/modules/v1/controllers/ShopController.php


+ 0 - 0
backendApi/modules/v1/controllers/SiteController.php


+ 0 - 0
backendApi/modules/v1/controllers/UserController.php


+ 0 - 0
backendApi/modules/v1/models/Admin.php


+ 0 - 0
backendApi/modules/v1/models/AdminForm.php


+ 0 - 0
backendApi/modules/v1/models/AdminRole.php


+ 0 - 0
backendApi/modules/v1/models/AdminRoleForm.php


+ 0 - 0
backendApi/modules/v1/models/AdminToken.php


+ 0 - 0
backendApi/modules/v1/models/LoginForm.php


+ 0 - 0
backendApi/modules/v1/models/User.php


+ 0 - 0
backendApi/modules/v1/models/exportForms/AtlasExportForm.php


Some files were not shown because too many files changed in this diff