fixed many issues

taobataoma · May 5, 2017 · 34458ae · 34458ae
1 parent 85f1724
commit 34458ae
Show file tree

Hide file tree

Showing 12 changed files with 63 additions and 31 deletions.
diff --git a/config/assets/default.js b/config/assets/default.js
@@ -31,7 +31,6 @@ module.exports = {
         'public/lib/angular-ui-notification/dist/angular-ui-notification.js',
         'public/lib/angular-ui-router/release/angular-ui-router.js',
         'public/lib/owasp-password-strength-test/owasp-password-strength-test.js',
-        'public/lib/angular-translate/angular-translate.js',
         'public/lib/bootstrap-filestyle/src/bootstrap-filestyle.js',
         'public/lib/angular-sanitize/angular-sanitize.js',
         //marked
@@ -48,7 +47,10 @@ module.exports = {
         //highlight
         'public/lib/highlightjs/highlight.pack.js',
         //local-storage
-        'public/lib/angular-local-storage/dist/angular-local-storage.js'
+        'public/lib/angular-local-storage/dist/angular-local-storage.js',
+        //translate
+        'public/lib/angular-translate/angular-translate.js'
+
         // endbower
       ],
       tests: ['public/lib/angular-mocks/angular-mocks.js']

diff --git a/config/assets/production.js b/config/assets/production.js
@@ -31,7 +31,6 @@ module.exports = {
         'public/lib/angular-ui-notification/dist/angular-ui-notification.min.js',
         'public/lib/angular-ui-router/release/angular-ui-router.min.js',
         'public/lib/owasp-password-strength-test/owasp-password-strength-test.js',
-        'public/lib/angular-translate/angular-translate.min.js',
         'public/lib/bootstrap-filestyle/src/bootstrap-filestyle.min.js',
         'public/lib/angular-sanitize/angular-sanitize.min.js',
         //marked
@@ -48,7 +47,9 @@ module.exports = {
         //highlight
         'public/lib/highlightjs/highlight.pack.min.js',
         //local-storage
-        'public/lib/angular-local-storage/dist/angular-local-storage.min.js'
+        'public/lib/angular-local-storage/dist/angular-local-storage.min.js',
+        //translate
+        'public/lib/angular-translate/angular-translate.min.js',
         // endbower
       ]
     },

diff --git a/modules/core/client/app/config.js b/modules/core/client/app/config.js
@@ -7,7 +7,7 @@
     applicationEnvironment: window.env,
     applicationModuleName: applicationModuleName,
     applicationModuleVendorDependencies: ['ngResource', 'ngAnimate', 'ngMessages', 'ui.router', 'ui.bootstrap', 'ngFileUpload', 'ui-notification',
-      'pascalprecht.translate', 'angularMoment', 'ngFileSaver', 'ngSanitize', 'uiCropper', 'hc.marked'],
+      'LocalStorageModule', 'pascalprecht.translate', 'angularMoment', 'ngFileSaver', 'ngSanitize', 'uiCropper', 'hc.marked'],
     registerModule: registerModule
   };
 

diff --git a/modules/core/client/app/init.js b/modules/core/client/app/init.js
@@ -9,8 +9,10 @@
   angular
     .module(app.applicationModuleName)
     .config(bootstrapConfig)
+    .config(localStorageModuleConfig)
     .config(transConfig)
-    .config(markedConfig);
+    .config(markedConfig)
+    .run(setDefaultLang);
 
   bootstrapConfig.$inject = ['$compileProvider', '$locationProvider', '$httpProvider', '$logProvider'];
 
@@ -28,11 +30,28 @@
     $logProvider.debugEnabled(app.applicationEnvironment !== 'production');
   }
 
+  localStorageModuleConfig.$inject = ['localStorageServiceProvider'];
+  function localStorageModuleConfig(localStorageServiceProvider) {
+    console.log('localStorageModuleConfig');
+    localStorageServiceProvider
+      .setPrefix('meanTorrent')
+      .setStorageType('localStorage')
+      .setDefaultToCookie(true)
+      .setNotify(true, true);
+  }
+
   transConfig.$inject = ['$translateProvider'];
   function transConfig($translateProvider) {
+    console.log('transConfig');
     $translateProvider.useSanitizeValueStrategy(null);
-    $translateProvider.preferredLanguage('en');
-    //$translateProvider.fallbackLanguage('cn');
+  }
+
+  setDefaultLang.$inject = ['$translate', 'getStorageLangService'];
+  function setDefaultLang($translate, getStorageLangService) {
+    console.log('setDefaultLang');
+    var user_lang = getStorageLangService.getLang();
+
+    $translate.use(user_lang);
   }
 
   markedConfig.$inject = ['markedProvider'];

diff --git a/modules/core/client/app/trans-string-en.js b/modules/core/client/app/trans-string-en.js
@@ -12,14 +12,14 @@
   // Don`t change other code
   // **************************************************
 
-  var stringen = {
+  var string_en = {
     COMINGSOON: 'coming soon...',
 
     //client topbar menu
     MENU_CHAT: 'Chat',
     MENU_TORRENTS: 'Torrents',
     MENU_TORRENTS_ADMIN: 'Manage Torrents',
-    MENU_USERS_ADMIN: 'Manage Torrents',
+    MENU_USERS_ADMIN: 'Manage User',
     MENU_UPLOAD: 'Upload',
     MENU_FORUMS: 'Forums',
     MENU_RANKING: 'Ranking',
@@ -366,7 +366,7 @@
   // config $translateProvider
   transConfig.$inject = ['$translateProvider'];
   function transConfig($translateProvider) {
-    $translateProvider.translations('en', stringen);
+    $translateProvider.translations('en', string_en);
   }
 
 }(ApplicationConfiguration));
diff --git a/modules/core/client/app/trans-string-cn.js → modules/core/client/app/trans-string-zh.js b/modules/core/client/app/trans-string-cn.js → modules/core/client/app/trans-string-zh.js
@@ -12,7 +12,7 @@
   // 请不要修改翻译部分之外的代码
   // **************************************************
 
-  var stringcn = {
+  var string_zh = {
     COMINGSOON: '开发中，请稍候...',
 
     //client topbar menu
@@ -366,7 +366,7 @@
   // config $translateProvider
   transConfig.$inject = ['$translateProvider'];
   function transConfig($translateProvider) {
-    $translateProvider.translations('cn', stringcn);
+    $translateProvider.translations('zh', string_zh);
   }
 
 }(ApplicationConfiguration));
diff --git a/modules/core/client/views/header.client.view.html b/modules/core/client/views/header.client.view.html
@@ -11,13 +11,13 @@
   <nav class="navbar-collapse" uib-collapse="!vm.isCollapsed" role="navigation">
     <ul class="nav navbar-nav" ng-if="vm.menu.shouldRender(vm.authentication.user);">
       <li ng-repeat="item in vm.menu.items | orderBy: 'position'" ng-if="item.shouldRender(vm.authentication.user);" ng-switch="item.type" ng-class="{ dropdown: item.type === 'dropdown' }" ui-sref-active="active" class="{{item.class}}" uib-dropdown="item.type === 'dropdown'">
-        <a ng-switch-when="dropdown" class="dropdown-toggle" uib-dropdown-toggle role="button">{{::item.title}}&nbsp;<span class="caret"></span></a>
+        <a ng-switch-when="dropdown" class="dropdown-toggle" uib-dropdown-toggle role="button"><span menu-title="{{item.title}}">{{::item.title}}</span>&nbsp;<span class="caret"></span></a>
         <ul ng-switch-when="dropdown" class="dropdown-menu">
           <li ui-sref-active="active" ng-repeat="subitem in item.items | orderBy: 'position'" ng-if="subitem.shouldRender(vm.authentication.user);">
-            <a ui-sref="{{subitem.state}}({{subitem.params}})" ng-bind="subitem.title"></a>
+            <a ui-sref="{{subitem.state}}({{subitem.params}})" ng-bind="subitem.title" menu-title="{{subitem.title}}"></a>
           </li>
         </ul>
-        <a ng-switch-default ui-sref="{{item.state}}" ng-bind="item.title"></a>
+        <a ng-switch-default ui-sref="{{item.state}}" ng-bind="item.title" menu-title="{{item.title}}"></a>
       </li>
     </ul>
     <ul class="nav navbar-nav navbar-right" ng-hide="vm.authentication.user">
@@ -37,7 +37,7 @@
         </a>
         <ul class="dropdown-menu" role="menu">
           <li ui-sref-active="active" ng-repeat="item in vm.accountMenu.items">
-            <a ui-sref="{{item.state}}" ng-bind="item.title"></a>
+            <a ui-sref="{{item.state}}" ng-bind="item.title" menu-title="{{item.title}}"></a>
           </li>
           <li class="divider"></li>
           <li>

diff --git a/modules/ranking/client/controllers/ranking.client.controller.js b/modules/ranking/client/controllers/ranking.client.controller.js
@@ -5,9 +5,9 @@
     .module('users.admin')
     .controller('RankingController', RankingController);
 
-  RankingController.$inject = ['$scope', 'RankingService', '$translate'];
+  RankingController.$inject = ['$scope', 'RankingService', '$translate', 'localStorageService'];
 
-  function RankingController($scope, RankingService, $translate) {
+  function RankingController($scope, RankingService, $translate, localStorageService) {
     var vm = this;
 
     vm.rankingTabs = [
@@ -17,13 +17,15 @@
       {title: $translate.instant('PAGE_HEADER_RANKING_SCORE'), templateUrl: 'score_ranking.html'}
     ];
 
-    RankingService.get(function (data) {
-      console.log(data);
+    vm.getRankingList = function () {
+      RankingService.get(function (data) {
+        console.log(data);
 
-      vm.upload_ranking = data.upload_ranking;
-      vm.download_ranking = data.download_ranking;
-      vm.ratio_ranking = data.ratio_ranking;
-      vm.score_ranking = data.score_ranking;
-    });
+        vm.upload_ranking = data.upload_ranking;
+        vm.download_ranking = data.download_ranking;
+        vm.ratio_ranking = data.ratio_ranking;
+        vm.score_ranking = data.score_ranking;
+      });
+    };
   }
 }());
diff --git a/modules/rules/client/templates/rules-en.md b/modules/rules/client/templates/rules-en.md
@@ -1,3 +1,3 @@
-## This is the RULES of CHD.im
+## This is the `USER RULES` of CHD.im
 
-The rules content is read from rules.md file, it is support `markdown` style.
+The rules content is read from rules.md file, it is support `markdown` style.
diff --git a/modules/torrents/client/config/torrents.client.menus.js b/modules/torrents/client/config/torrents.client.menus.js
@@ -8,6 +8,8 @@
   menuConfig.$inject = ['menuService', '$translate'];
 
   function menuConfig(menuService, $translate) {
+    console.log('menuConfig');
+
     menuService.addMenuItem('topbar', {
       title: $translate.instant('MENU_TORRENTS'),
       state: 'torrents',

diff --git a/modules/vip/client/controllers/vip.client.controller.js b/modules/vip/client/controllers/vip.client.controller.js
@@ -5,13 +5,19 @@
     .module('vip')
     .controller('VipController', VipController);
 
-  VipController.$inject = ['$scope', '$translate'];
+  VipController.$inject = ['$scope', '$translate', 'localStorageService'];
 
-  function VipController($scope, $translate) {
+  function VipController($scope, $translate, localStorageService) {
     var vm = this;
 
     vm.init = function () {
+      var o = localStorageService.get('storage_user_lang');
 
+      if (o === 'en') {
+        localStorageService.set('storage_user_lang', 'zh');
+      } else {
+        localStorageService.set('storage_user_lang', 'en');
+      }
     };
   }
 }());
diff --git a/modules/vip/client/templates/vip-en.md b/modules/vip/client/templates/vip-en.md
@@ -1,3 +1,3 @@
-## This is the VIP of CHD.im
+## This is the `VIP RULES` of CHD.im
 
 The rules content is read from vip.md file, it is support `markdown` style.