diff --git a/modules/core/client/app/trans-string-en.js b/modules/core/client/app/trans-string-en.js index 2e8e93d6..36fb873b 100644 --- a/modules/core/client/app/trans-string-en.js +++ b/modules/core/client/app/trans-string-en.js @@ -39,7 +39,7 @@ SIGNOUT: 'Sign out', SIGNIN: 'Sign In', SIGNUP: 'Sign Up', - MENU_MESSAGE_INBOX: 'Message Inbox', + MENU_MESSAGE_BOX: 'Message Box', MENU_SCORE_LEVEL: 'Score Level', MENU_MY_INVITE: 'My Invitations', MENU_ACCOUNT_STATUS: 'Account Status', @@ -115,7 +115,7 @@ ADMIN_TORRENTS_LIST: 'Torrents LIst', PASSWORD_FORGOT: 'Password forgot', PASSWORD_RESET: 'Password reset', - MESSAGES_LIST: 'messages', + MESSAGES_LIST: 'MessageBox', STATUS_ACCOUNT: 'Account Status', STATUS_UPLOADED: 'Uploaded', STATUS_SEEDING: 'Seeding', @@ -467,7 +467,7 @@ INVALID_INVITATION_TIP: 'Invalid invitation, maybe the invitation is expired.', //user message box - MESSAGES_INBOX: 'Messages Inbox', + MESSAGES_BOX: 'Messages Box', //chat view CHAT_USERS_LIST: 'Users List', diff --git a/modules/core/client/app/trans-string-zh.js b/modules/core/client/app/trans-string-zh.js index 8e45b8ba..ce469610 100644 --- a/modules/core/client/app/trans-string-zh.js +++ b/modules/core/client/app/trans-string-zh.js @@ -39,7 +39,7 @@ SIGNOUT: '退出登录', SIGNIN: '登录', SIGNUP: '注册', - MENU_MESSAGE_INBOX: '消息收件箱', + MENU_MESSAGE_BOX: '站内消息', MENU_SCORE_LEVEL: '积分等级', MENU_MY_INVITE: '我的邀请', MENU_ACCOUNT_STATUS: '帐户状态', @@ -467,7 +467,7 @@ INVALID_INVITATION_TIP: '无效的邀请, 该邀请可能已过期.', //user message box - MESSAGES_INBOX: '消息收件箱', + MESSAGES_BOX: '站内消息', //chat view CHAT_USERS_LIST: '用户列表', diff --git a/modules/messages/client/config/messages.client.menus.js b/modules/messages/client/config/messages.client.menus.js index fb1b8474..9f771b8b 100644 --- a/modules/messages/client/config/messages.client.menus.js +++ b/modules/messages/client/config/messages.client.menus.js @@ -20,8 +20,8 @@ }); menuService.addSubMenuItem('mt-message', 'messages', { - title: 'MENU_MESSAGE_INBOX', - state: 'messages.inbox' + title: 'MENU_MESSAGE_BOX', + state: 'messages.box' }); } }()); diff --git a/modules/messages/client/config/messages.client.routes.js b/modules/messages/client/config/messages.client.routes.js index c61e9d8a..d95e4b73 100644 --- a/modules/messages/client/config/messages.client.routes.js +++ b/modules/messages/client/config/messages.client.routes.js @@ -16,9 +16,9 @@ url: '/messages', templateUrl: '/modules/messages/client/views/messages.client.view.html' }) - .state('messages.inbox', { - url: '/inbox', - templateUrl: '/modules/messages/client/views/inbox.client.view.html', + .state('messages.box', { + url: '/box', + templateUrl: '/modules/messages/client/views/box.client.view.html', data: { pageTitle: 'PAGETITLE.MESSAGES_LIST' } diff --git a/modules/messages/client/views/inbox.client.view.html b/modules/messages/client/views/box.client.view.html similarity index 73% rename from modules/messages/client/views/inbox.client.view.html rename to modules/messages/client/views/box.client.view.html index 85dd4e64..a49f934b 100644 --- a/modules/messages/client/views/inbox.client.view.html +++ b/modules/messages/client/views/box.client.view.html @@ -2,7 +2,7 @@