From 04ebf3a49ed3785e0a9cba484c8d267c3ebe7dfb Mon Sep 17 00:00:00 2001 From: OldHawk Date: Sat, 6 May 2017 15:04:22 +0800 Subject: [PATCH] add language select menu & option --- config/env/torrents.js | 4 ++-- .../controllers/header.client.controller.js | 13 +++++++++-- .../controllers/home.client.controller.js | 1 - modules/core/client/less/mt.less | 23 +++++++++++++++++++ .../core/client/views/footer.client.view.html | 7 +++++- .../core/client/views/header.client.view.html | 6 +++++ .../controllers/vip.client.controller.js | 12 ++-------- 7 files changed, 50 insertions(+), 16 deletions(-) diff --git a/config/env/torrents.js b/config/env/torrents.js index a12efe4d..f26c7140 100644 --- a/config/env/torrents.js +++ b/config/env/torrents.js @@ -3,8 +3,8 @@ module.exports = { meanTorrentConfig: { language: [ - {name: 'en', css: '.flag-icon-gb'}, - {name: 'zh', css: '.flag-icon-cn'} + {name: 'en', index: 0, class: 'flag-icon-gb', title: 'English'}, + {name: 'zh', index: 1, class: 'flag-icon-cn', title: '中文'} ], announce: { url: 'http://127.0.0.1:3000/announce', diff --git a/modules/core/client/controllers/header.client.controller.js b/modules/core/client/controllers/header.client.controller.js index a1fadfad..b1c9c56d 100644 --- a/modules/core/client/controllers/header.client.controller.js +++ b/modules/core/client/controllers/header.client.controller.js @@ -5,10 +5,11 @@ .module('core') .controller('HeaderController', HeaderController); - HeaderController.$inject = ['$scope', '$state', 'Authentication', 'menuService']; + HeaderController.$inject = ['$scope', '$state', '$translate', 'Authentication', 'menuService', 'MeanTorrentConfig', 'localStorageService']; - function HeaderController($scope, $state, Authentication, menuService) { + function HeaderController($scope, $state, $translate, Authentication, menuService, MeanTorrentConfig, localStorageService) { var vm = this; + vm.language = MeanTorrentConfig.meanTorrentConfig.language; vm.accountMenu = menuService.getMenu('account').items[0]; vm.authentication = Authentication; @@ -21,5 +22,13 @@ // Collapsing the menu after navigation vm.isCollapsed = false; } + + vm.changeLanguage = function (langKey) { + console.log('langKey=' + langKey); + localStorageService.set('storage_user_lang', langKey); + $translate.use(langKey); + + $state.reload(); + }; } }()); diff --git a/modules/core/client/controllers/home.client.controller.js b/modules/core/client/controllers/home.client.controller.js index d96156da..42ff075d 100644 --- a/modules/core/client/controllers/home.client.controller.js +++ b/modules/core/client/controllers/home.client.controller.js @@ -13,7 +13,6 @@ vm.movieTopList = undefined; vm.info_is_ready = false; - //$translate.use('en'); vm.COMING = 'coming soon...'; diff --git a/modules/core/client/less/mt.less b/modules/core/client/less/mt.less index 5bf5a83e..bf31c397 100644 --- a/modules/core/client/less/mt.less +++ b/modules/core/client/less/mt.less @@ -507,4 +507,27 @@ margin-bottom: 15px; margin-top: 5px; } +} + +.lang-list { + margin-left: 10px; + line-height: 2; + .flag-icon { + font-size: 18px; + margin-left: 10px; + &, + &:hover, + &:focus { + cursor: pointer; + } + } +} + +.lang-footer { + margin-left: 0; + .flag-icon { + font-size: 15px; + margin-left: 0px; + margin-right: 10px; + } } \ No newline at end of file diff --git a/modules/core/client/views/footer.client.view.html b/modules/core/client/views/footer.client.view.html index d8f6c730..cba22ba7 100644 --- a/modules/core/client/views/footer.client.view.html +++ b/modules/core/client/views/footer.client.view.html @@ -1,8 +1,13 @@ -
+