diff --git a/modules/core/client/app/init.js b/modules/core/client/app/init.js index 8ffaef33..e7d02960 100644 --- a/modules/core/client/app/init.js +++ b/modules/core/client/app/init.js @@ -8,7 +8,8 @@ // Setting HTML5 Location Mode angular .module(app.applicationModuleName) - .config(bootstrapConfig); + .config(bootstrapConfig) + .config(transConfig); bootstrapConfig.$inject = ['$compileProvider', '$locationProvider', '$httpProvider', '$logProvider']; @@ -26,6 +27,12 @@ $logProvider.debugEnabled(app.applicationEnvironment !== 'production'); } + transConfig.$inject = ['$translateProvider']; + function transConfig($translateProvider) { + $translateProvider.useSanitizeValueStrategy('escape'); + $translateProvider.preferredLanguage('en'); + //$translateProvider.fallbackLanguage('cn'); + } // Then define the init function for starting up the application angular.element(document).ready(init); diff --git a/modules/core/client/app/trans-string-cn.js b/modules/core/client/app/trans-string-cn.js index 3fbb36ba..373c8a5c 100644 --- a/modules/core/client/app/trans-string-cn.js +++ b/modules/core/client/app/trans-string-cn.js @@ -13,7 +13,16 @@ // ************************************************** var stringcn = { - COMINGSOON: '开发中,请稍候...' + COMINGSOON: '开发中,请稍候...', + + //client menu + SIGNOUT: '退出登录', + SIGNIN: '登录', + SIGNUP: '注册', + EDIT_PROFILE: '修改个人信息', + EDIT_PROFILE_PIC: '修改个人头像', + CHANGE_PASSWORD: '修改登录密码', + MANAGE_SOCIAL_ACCOUNTS: '管理社交帐号' }; // ************************************************** @@ -23,7 +32,6 @@ // config $translateProvider transConfig.$inject = ['$translateProvider']; function transConfig($translateProvider) { - $translateProvider.useSanitizeValueStrategy('escape'); $translateProvider.translations('cn', stringcn); } diff --git a/modules/core/client/app/trans-string-en.js b/modules/core/client/app/trans-string-en.js index 29cc3826..969e6767 100644 --- a/modules/core/client/app/trans-string-en.js +++ b/modules/core/client/app/trans-string-en.js @@ -13,7 +13,16 @@ // ************************************************** var stringen = { - COMINGSOON: 'coming soon...' + COMINGSOON: 'coming soon...', + + //client menu + SIGNOUT: 'Signout', + SIGNIN: 'Sign In', + SIGNUP: 'Sign Up', + EDIT_PROFILE: 'Edit Profile', + EDIT_PROFILE_PIC: 'Edit Profile Picture', + CHANGE_PASSWORD: 'Change Password', + MANAGE_SOCIAL_ACCOUNTS: 'Manage Social Accounts' }; // ************************************************** @@ -24,8 +33,6 @@ transConfig.$inject = ['$translateProvider']; function transConfig($translateProvider) { $translateProvider.translations('en', stringen); - $translateProvider.preferredLanguage('cn'); - $translateProvider.fallbackLanguage('cn'); } }(ApplicationConfiguration)); diff --git a/modules/core/client/config/core.client.menus.js b/modules/core/client/config/core.client.menus.js index cd220853..8fa3dd7a 100644 --- a/modules/core/client/config/core.client.menus.js +++ b/modules/core/client/config/core.client.menus.js @@ -5,9 +5,9 @@ .module('core') .run(menuConfig); - menuConfig.$inject = ['menuService']; + menuConfig.$inject = ['menuService', '$translate', '$filter']; - function menuConfig(menuService) { + function menuConfig(menuService, $translate) { menuService.addMenu('account', { roles: ['user'] }); @@ -20,22 +20,22 @@ }); menuService.addSubMenuItem('account', 'settings', { - title: 'Edit Profile', + title: $translate.instant('EDIT_PROFILE'), state: 'settings.profile' }); menuService.addSubMenuItem('account', 'settings', { - title: 'Edit Profile Picture', + title: $translate.instant('EDIT_PROFILE_PIC'), state: 'settings.picture' }); menuService.addSubMenuItem('account', 'settings', { - title: 'Change Password', + title: $translate.instant('CHANGE_PASSWORD'), state: 'settings.password' }); menuService.addSubMenuItem('account', 'settings', { - title: 'Manage Social Accounts', + title: $translate.instant('MANAGE_SOCIAL_ACCOUNTS'), state: 'settings.accounts' }); } diff --git a/modules/core/client/views/header.client.view.html b/modules/core/client/views/header.client.view.html index 331b749b..b3ac5afe 100644 --- a/modules/core/client/views/header.client.view.html +++ b/modules/core/client/views/header.client.view.html @@ -22,11 +22,11 @@