diff --git a/config/assets/default.js b/config/assets/default.js index 4444ed3c..32745527 100644 --- 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 index fc388a8f..d70ca608 100644 --- 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 index b2b21aa9..212dd29d 100644 --- 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 index 7bbea6e1..0975e518 100644 --- 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 index c4e05f6f..a5f805ae 100644 --- 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 b/modules/core/client/app/trans-string-zh.js similarity index 99% rename from modules/core/client/app/trans-string-cn.js rename to modules/core/client/app/trans-string-zh.js index b5f91f8f..837aaa93 100644 --- a/modules/core/client/app/trans-string-cn.js +++ b/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 index b559c278..f6bce980 100644 --- a/modules/core/client/views/header.client.view.html +++ b/modules/core/client/views/header.client.view.html @@ -11,13 +11,13 @@