diff --git a/modules/core/client/app/init.js b/modules/core/client/app/init.js
index 3126b5ce..c37fa72c 100644
--- a/modules/core/client/app/init.js
+++ b/modules/core/client/app/init.js
@@ -31,7 +31,7 @@
transConfig.$inject = ['$translateProvider'];
function transConfig($translateProvider) {
$translateProvider.useSanitizeValueStrategy(null);
- $translateProvider.preferredLanguage('en');
+ $translateProvider.preferredLanguage('cn');
//$translateProvider.fallbackLanguage('cn');
}
diff --git a/modules/core/client/app/trans-string-cn.js b/modules/core/client/app/trans-string-cn.js
index 7e007f34..fc2172ef 100644
--- a/modules/core/client/app/trans-string-cn.js
+++ b/modules/core/client/app/trans-string-cn.js
@@ -19,6 +19,7 @@
MENU_CHAT: '聊天室',
MENU_TORRENTS: '种子',
MENU_TORRENTS_ADMIN: '种子管理',
+ MENU_USERS_ADMIN: '用户管理',
MENU_UPLOAD: '发布',
MENU_FORUMS: '论坛',
MENU_RANKING: '排行榜',
@@ -233,6 +234,26 @@
PAGE_HEADER_RANKING_RATIO: '分享率排行榜',
PAGE_HEADER_RANKING_SCORE: '积分排行榜',
+ //admin views
+ USERS_LIST: '用户列表',
+ USERS_UPDATE: '修改',
+
+ //user settings
+ SETTINGS: '控制面版',
+ BUTTON_SAVE_PROFILE: '保存',
+ BUTTON_SELECT_PICTURE: '选择图片',
+ BUTTON_USE_THIS_PICTURE: '应用图片',
+ BUTTON_CANCEL: '取消',
+ BUTTON_COMPLETE: '完成',
+ BUTTON_SAVE_PASSWORD: '保存密码',
+ CAPTION_CURRENT_PASSWORD: '当前密码',
+ CAPTION_NEW_PASSWORD: '新密码',
+ CAPTION_VERIFY_PASSWORD: '验证密码',
+ CAPTION_REQUIRED_CURRENT_PASSWORD: '请输入当前密码.',
+ CAPTION_REQUIRED_NEW_PASSWORD: '请输入新密码.',
+ CAPTION_REQUIRED_VERIFY_PASSWORD: '请再输入一次新密码.',
+ CAPTION_PASSWORD_NOT_MATCH: '两次输入的新密码不一致.',
+
//footer view
MIT_PROTOCOL: '本项目源码受 MIT 开源协议保护',
GIT_REPO: 'Power by ©meanTottent，GitHub 源码仓库',
diff --git a/modules/core/client/app/trans-string-en.js b/modules/core/client/app/trans-string-en.js
index 91f8c0c0..1c6c67f9 100644
--- a/modules/core/client/app/trans-string-en.js
+++ b/modules/core/client/app/trans-string-en.js
@@ -19,6 +19,7 @@
MENU_CHAT: 'Chat',
MENU_TORRENTS: 'Torrents',
MENU_TORRENTS_ADMIN: 'Manage Torrents',
+ MENU_USERS_ADMIN: 'Manage Torrents',
MENU_UPLOAD: 'Upload',
MENU_FORUMS: 'Forums',
MENU_RANKING: 'Ranking',
@@ -233,6 +234,26 @@
PAGE_HEADER_RANKING_RATIO: 'Ratio Ranking',
PAGE_HEADER_RANKING_SCORE: 'Score Ranking',
+ //admin views
+ USERS_LIST: 'Users',
+ USERS_UPDATE: 'Update',
+
+ //user settings
+ SETTINGS: 'Settings',
+ BUTTON_SAVE_PROFILE: 'Save Profile',
+ BUTTON_SELECT_PICTURE: 'Select Picture',
+ BUTTON_USE_THIS_PICTURE: 'Use This Picture',
+ BUTTON_CANCEL: 'Cancel',
+ BUTTON_COMPLETE: 'Complete',
+ BUTTON_SAVE_PASSWORD: 'Save Password',
+ CAPTION_CURRENT_PASSWORD: 'Current Password',
+ CAPTION_NEW_PASSWORD: 'New Password',
+ CAPTION_VERIFY_PASSWORD: 'Verify Password',
+ CAPTION_REQUIRED_CURRENT_PASSWORD: 'Your current password is required.',
+ CAPTION_REQUIRED_NEW_PASSWORD: 'Enter a new password.',
+ CAPTION_REQUIRED_VERIFY_PASSWORD: 'Verify your new password.',
+ CAPTION_PASSWORD_NOT_MATCH: 'Passwords do not match.',
+
//footer view
MIT_PROTOCOL: 'The source of this project is protected by MIT open source protocol',
GIT_REPO: 'Power by ©meanTottent，view on GitHub',
diff --git a/modules/core/client/less/margin.less b/modules/core/client/less/margin.less
index a13062c2..d97e6f0f 100644
--- a/modules/core/client/less/margin.less
+++ b/modules/core/client/less/margin.less
@@ -80,4 +80,8 @@
.margin-left-m-20 {
margin-left: -20px;
-}
\ No newline at end of file
+}
+
+.margin-left-10 {
+ margin-left: 10px;
+}
diff --git a/modules/core/client/less/mt.less b/modules/core/client/less/mt.less
index 1324ab5a..276fd14b 100644
--- a/modules/core/client/less/mt.less
+++ b/modules/core/client/less/mt.less
@@ -492,4 +492,11 @@
.ranking-active-col {
color: @mt-base-color;
+}
+
+.admin-user-info {
+ hr {
+ margin-bottom: 15px;
+ margin-top: 5px;
+ }
}
\ No newline at end of file
diff --git a/modules/users/client/config/users-admin.client.menus.js b/modules/users/client/config/users-admin.client.menus.js
index 3a50c112..dae38cbc 100644
--- a/modules/users/client/config/users-admin.client.menus.js
+++ b/modules/users/client/config/users-admin.client.menus.js
@@ -5,12 +5,12 @@
.module('users.admin')
.run(menuConfig);
- menuConfig.$inject = ['menuService'];
+ menuConfig.$inject = ['menuService', '$translate'];
// Configuring the Users module
- function menuConfig(menuService) {
+ function menuConfig(menuService, $translate) {
menuService.addSubMenuItem('topbar', 'admin', {
- title: 'Manage Users',
+ title: $translate.instant('MENU_USERS_ADMIN'),
state: 'admin.users'
});
}
diff --git a/modules/users/client/views/admin/edit-user.client.view.html b/modules/users/client/views/admin/edit-user.client.view.html
index c1ee9939..cd385a10 100644
--- a/modules/users/client/views/admin/edit-user.client.view.html
+++ b/modules/users/client/views/admin/edit-user.client.view.html
@@ -1,6 +1,6 @@