From 6c6fe66350fe4ac90a2283ea61be719d8e6bc430 Mon Sep 17 00:00:00 2001 From: liyang <1711467488@qq.com> Date: Fri, 24 May 2019 10:09:05 +0800 Subject: [PATCH] layout i18n Former-commit-id: e761056ea154aedf2ae927936fff49ba5b9fcb66 [formerly e761056ea154aedf2ae927936fff49ba5b9fcb66 [formerly e761056ea154aedf2ae927936fff49ba5b9fcb66 [formerly e761056ea154aedf2ae927936fff49ba5b9fcb66 [formerly 3cc73e4d679f97554d2c1f8f253bc4d6447694c1 [formerly a05de779fd7fb56b722cdb448baee6b1d44208ed]]]]] Former-commit-id: 02aa23fd3e50eb0780d75b3bc9c5209dbf1f0e67 Former-commit-id: b21e3fe71b527439904a1a574e3d3a3032bcef09 Former-commit-id: bba111d14373493a4ef35318bfb7f41c8c388914 [formerly c1dd1cdbe86b65faff26c35db32d1ee942a97054] Former-commit-id: d2c677083ddb6e285ea033ce8e62432ca2a89907 Former-commit-id: 8fa9b2196bc47bf6bf97b1355630eb443c4d2564 Former-commit-id: ec58dc5a2aff6a11fa31144035ca0bd250acbe63 Former-commit-id: 27ef4661fcb60de5968ce0b75d7d006774f88f0c Former-commit-id: 352e82ebff5f22931fae48cb2525ad9867a98fa6 --- d2-admin.babel.REMOVED.git-id | 2 +- .../components/components/menu-item/index.vue | 2 +- .../components/header-fullscreen/index.vue | 2 +- .../components/header-log/index.vue | 6 +- .../components/header-size/index.vue | 24 ++--- .../components/d2-theme-list/index.vue | 8 +- .../components/header-theme/index.vue | 6 +- .../components/header-user/index.vue | 4 +- .../components/menu-side/index.vue | 2 +- .../header-aside/components/mixin/menu.js | 2 +- .../components/panel-search/index.vue | 15 +-- .../header-aside/components/tabs/index.vue | 36 ++++--- src/locales/en.json | 102 ++++++++++++++++-- src/locales/ja.json | 102 ++++++++++++++++-- src/locales/zh-chs.json | 102 ++++++++++++++++-- src/locales/zh-cht.json | 102 ++++++++++++++++-- src/store/modules/d2admin/modules/account.js | 9 +- src/views/system/log/index.vue | 4 +- 18 files changed, 441 insertions(+), 89 deletions(-) diff --git a/d2-admin.babel.REMOVED.git-id b/d2-admin.babel.REMOVED.git-id index ddba107b..ffa85441 100644 --- a/d2-admin.babel.REMOVED.git-id +++ b/d2-admin.babel.REMOVED.git-id @@ -1 +1 @@ -681ffc71f82857c857c50891b8f73e04e345c7db \ No newline at end of file +dc12e7a41dd2118aa502884a5a8799c47c5897e5 \ No newline at end of file diff --git a/src/layout/header-aside/components/components/menu-item/index.vue b/src/layout/header-aside/components/components/menu-item/index.vue index 9c52df5e..391b32fe 100644 --- a/src/layout/header-aside/components/components/menu-item/index.vue +++ b/src/layout/header-aside/components/components/menu-item/index.vue @@ -3,7 +3,7 @@ - {{menu.title || '未命名菜单'}} + {{menu.title || $t('layout.header-aside.menu-item.label-default')}} diff --git a/src/layout/header-aside/components/header-fullscreen/index.vue b/src/layout/header-aside/components/header-fullscreen/index.vue index 2fda4a5a..7e93acf0 100644 --- a/src/layout/header-aside/components/header-fullscreen/index.vue +++ b/src/layout/header-aside/components/header-fullscreen/index.vue @@ -1,7 +1,7 @@ diff --git a/src/layout/header-aside/components/header-theme/index.vue b/src/layout/header-aside/components/header-theme/index.vue index 1b54686a..44509446 100644 --- a/src/layout/header-aside/components/header-theme/index.vue +++ b/src/layout/header-aside/components/header-theme/index.vue @@ -2,8 +2,8 @@
+ placement="bottom" + :content="$t('layout.header-aside.header-theme.tooltip.content')"> diff --git a/src/layout/header-aside/components/header-user/index.vue b/src/layout/header-aside/components/header-user/index.vue index d9ffa972..60971a0a 100644 --- a/src/layout/header-aside/components/header-user/index.vue +++ b/src/layout/header-aside/components/header-user/index.vue @@ -1,10 +1,10 @@ diff --git a/src/layout/header-aside/components/mixin/menu.js b/src/layout/header-aside/components/mixin/menu.js index 7160b58f..2ea3843f 100644 --- a/src/layout/header-aside/components/mixin/menu.js +++ b/src/layout/header-aside/components/mixin/menu.js @@ -4,7 +4,7 @@ export default { methods: { handleMenuSelect (index, indexPath) { if (/^d2-menu-empty-\d+$/.test(index) || index === undefined) { - this.$message.warning('临时菜单') + this.$message.warning(this.$t('layout.header-aside.message.warning.temporary-menu')) } else if (/^https:\/\/|http:\/\//.test(index)) { util.open(index) } else { diff --git a/src/layout/header-aside/components/panel-search/index.vue b/src/layout/header-aside/components/panel-search/index.vue index 335d692d..e4a64bb0 100644 --- a/src/layout/header-aside/components/panel-search/index.vue +++ b/src/layout/header-aside/components/panel-search/index.vue @@ -15,7 +15,7 @@ ref="input" v-model="searchText" suffix-icon="el-icon-search" - placeholder="搜索页面" + :placeholder="$t('layout.header-aside.panel-search.autocomplete-placeholder')" :fetch-suggestions="querySearch" :trigger-on-focus="false" :clearable="true" @@ -26,11 +26,7 @@ :item="item"/>
- 您可以使用快捷键 - {{hotkey.open}} - 唤醒搜索面板,按 - {{hotkey.close}} - 关闭 + {{ $t('layout.header-aside.panel-search.tip', { open: hotkey.open, close: hotkey.close }) }}
@@ -38,19 +38,19 @@ - 关闭左侧 + {{ $t('layout.header-aside.tabs.close-left') }} - 关闭右侧 + {{ $t('layout.header-aside.tabs.close-right') }} - 关闭其它 + {{ $t('layout.header-aside.tabs.close-other') }} - 全部关闭 + {{ $t('layout.header-aside.tabs.close-all') }} @@ -70,15 +70,6 @@ export default { contextmenuFlag: false, contentmenuX: 0, contentmenuY: 0, - contextmenuListIndex: [ - { icon: 'times-circle', title: '关闭全部', value: 'all' } - ], - contextmenuList: [ - { icon: 'arrow-left', title: '关闭左侧', value: 'left' }, - { icon: 'arrow-right', title: '关闭右侧', value: 'right' }, - { icon: 'times', title: '关闭其它', value: 'other' }, - { icon: 'times-circle', title: '关闭全部', value: 'all' } - ], tagName: '/index' } }, @@ -86,7 +77,20 @@ export default { ...mapState('d2admin/page', [ 'opened', 'current' - ]) + ]), + contextmenuListIndex () { + return [ + { icon: 'times-circle', title: this.$t('layout.header-aside.tabs.close-all'), value: 'all' } + ] + }, + contextmenuList () { + return [ + { icon: 'arrow-left', title: this.$t('layout.header-aside.tabs.close-left'), value: 'left' }, + { icon: 'arrow-right', title: this.$t('layout.header-aside.tabs.close-right'), value: 'right' }, + { icon: 'times', title: this.$t('layout.header-aside.tabs.close-other'), value: 'other' }, + { icon: 'times-circle', title: this.$t('layout.header-aside.tabs.close-all'), value: 'all' } + ] + } }, methods: { ...mapActions('d2admin/page', [ @@ -147,7 +151,7 @@ export default { this.closeAll() break default: - this.$message.error('无效的操作') + this.$message.error(this.$t('public.message.error.handle.invalid')) break } }, diff --git a/src/locales/en.json b/src/locales/en.json index de531a73..a828344d 100644 --- a/src/locales/en.json +++ b/src/locales/en.json @@ -1,15 +1,111 @@ { "_name": "English", + "layout": { + "header-aside": { + "header-fullscreen": { + "active": "full screen", + "exit": "Exit full screen" + }, + "header-log": { + "empty": "No logs or exceptions", + "error-length": "Contains {length} exceptions", + "log-length": "{length} logs" + }, + "header-size": { + "options": { + "default": "Default", + "medium": "in", + "mini": "Minimum", + "small": "Small" + } + }, + "header-theme": { + "dialog": { + "title": "Theme" + }, + "list": { + "button": { + "is-active": "Activated", + "select": "Select" + }, + "column": { + "label": { + "preview": "Preview" + } + } + }, + "tooltip": { + "content": "Theme" + } + }, + "header-user": { + "hello": "Hello there", + "log-off": "Logout" + }, + "menu-item": { + "label-default": "Unnamed menu" + }, + "menu-side": { + "empty": "No sidebar menu" + }, + "message": { + "warning": { + "temporary-menu": "Temporary menu" + } + }, + "panel-search": { + "autocomplete-placeholder": "Search page", + "tip": "You can wake up the search panel with the shortcut {open} and press {close} to close" + }, + "tabs": { + "close-all": "Close all", + "close-left": "Close left", + "close-other": "Close other", + "close-right": "Close right", + "label-default": "unnamed" + } + } + }, "public": { + "confirm": { + "special": { + "logout": { + "button": { + "cancel": "Give up", + "confirm": "Confirm logout" + }, + "message": "Can I log out of my current account? The open tabs and user settings will be saved.", + "title": "Confirmation operation" + } + } + }, "message": { "error": { "form": { "invalid": "Form verification failed, please check" + }, + "handle": { + "invalid": "Invalid operation" + } + }, + "special": { + "logout": { + "cancel": "Abandon logout user" } } }, "notify": { "special": { + "component-size": { + "changed": { + "message": "Global component size has changed", + "title": "prompt" + } + }, + "show-log": { + "message": "The full log content has been printed to the console", + "title": "log details" + }, "upload": { "error": { "message": "Data upload failed", @@ -93,12 +189,6 @@ } }, "log": { - "notify": { - "more": { - "message": "The full log content has been printed to the console", - "title": "log details" - } - }, "table": { "empty-text": "No log information yet", "label": { diff --git a/src/locales/ja.json b/src/locales/ja.json index b0c5f0e8..13ed4dfe 100644 --- a/src/locales/ja.json +++ b/src/locales/ja.json @@ -1,15 +1,111 @@ { "_name": "日本語", + "layout": { + "header-aside": { + "header-fullscreen": { + "active": "全画面", + "exit": "全画面を終了" + }, + "header-log": { + "empty": "ログや例外はありません", + "error-length": " {length} 個の例外が含まれています", + "log-length": "{length} 個のログ" + }, + "header-size": { + "options": { + "default": "デフォルト", + "medium": "普通", + "mini": "最小", + "small": "小さい" + } + }, + "header-theme": { + "dialog": { + "title": "テーマ" + }, + "list": { + "button": { + "is-active": "有効化", + "select": "選ぶ" + }, + "column": { + "label": { + "preview": "プレビュー" + } + } + }, + "tooltip": { + "content": "テーマ" + } + }, + "header-user": { + "hello": "こんにちは", + "log-off": "ログアウト" + }, + "menu-item": { + "label-default": "名前のないメニュー" + }, + "menu-side": { + "empty": "サイドバーメニューなし" + }, + "message": { + "warning": { + "temporary-menu": "一時メニュー" + } + }, + "panel-search": { + "autocomplete-placeholder": "検索ページ", + "tip": "ショートカット {open} で検索パネルを起動し、 {close} を押して閉じることができます" + }, + "tabs": { + "close-all": "すべて閉じる", + "close-left": "左に閉じる", + "close-other": "その他を閉じる", + "close-right": "右に閉じる", + "label-default": "無名:" + } + } + }, "public": { + "confirm": { + "special": { + "logout": { + "button": { + "cancel": "あきらめる", + "confirm": "ログアウトを確認" + }, + "message": "現在のアカウントからログアウトできますか?開いているタブとユーザー設定が保存されます。", + "title": "確認操作" + } + } + }, "message": { "error": { "form": { "invalid": "フォームの確認に失敗しました。確認してください" + }, + "handle": { + "invalid": "無効な操作" + } + }, + "special": { + "logout": { + "cancel": "ログアウトユーザーを放棄する" } } }, "notify": { "special": { + "component-size": { + "changed": { + "message": "グローバルコンポーネントサイズが変更されました", + "title": "プロンプト" + } + }, + "show-log": { + "message": "ログ全体の内容がコンソールに出力されました", + "title": "ログ詳細" + }, "upload": { "error": { "message": "データのアップロードに失敗しました", @@ -93,12 +189,6 @@ } }, "log": { - "notify": { - "more": { - "message": "ログ全体の内容がコンソールに出力されました", - "title": "ログ詳細" - } - }, "table": { "empty-text": "ログ情報はまだありません", "label": { diff --git a/src/locales/zh-chs.json b/src/locales/zh-chs.json index 3ec07be9..d5194845 100644 --- a/src/locales/zh-chs.json +++ b/src/locales/zh-chs.json @@ -1,15 +1,111 @@ { "_name": "简体中文", + "layout": { + "header-aside": { + "header-fullscreen": { + "active": "全屏", + "exit": "退出全屏" + }, + "header-log": { + "empty": "没有日志或异常", + "error-length": "包含 {length} 个异常", + "log-length": "{length} 条日志" + }, + "header-size": { + "options": { + "default": "默认", + "medium": "中", + "mini": "最小", + "small": "小" + } + }, + "header-theme": { + "dialog": { + "title": "主题" + }, + "list": { + "button": { + "is-active": "已激活", + "select": "选择" + }, + "column": { + "label": { + "preview": "预览" + } + } + }, + "tooltip": { + "content": "主题" + } + }, + "header-user": { + "hello": "你好", + "log-off": "注销" + }, + "menu-item": { + "label-default": "未命名菜单" + }, + "menu-side": { + "empty": "没有侧栏菜单" + }, + "message": { + "warning": { + "temporary-menu": "临时菜单" + } + }, + "panel-search": { + "autocomplete-placeholder": "搜索页面", + "tip": "你可以使用快捷键 {open} 唤醒搜索面板,按 {close} 关闭" + }, + "tabs": { + "close-all": "全部关闭", + "close-left": "关闭左侧", + "close-other": "关闭其它", + "close-right": "关闭右侧", + "label-default": "未命名" + } + } + }, "public": { + "confirm": { + "special": { + "logout": { + "button": { + "cancel": "放弃", + "confirm": "确定注销" + }, + "message": "注销当前账户吗? 打开的标签页和用户设置将会被保存。", + "title": "确认操作" + } + } + }, "message": { "error": { "form": { "invalid": "表单校验失败,请检查" + }, + "handle": { + "invalid": "无效的操作" + } + }, + "special": { + "logout": { + "cancel": "放弃注销用户" } } }, "notify": { "special": { + "component-size": { + "changed": { + "message": "全局组件尺寸已经变更", + "title": "提示" + } + }, + "show-log": { + "message": "完整的日志内容已经打印到控制台", + "title": "日志详情" + }, "upload": { "error": { "message": "数据上传失败", @@ -93,12 +189,6 @@ } }, "log": { - "notify": { - "more": { - "message": "完整的日志内容已经打印到控制台", - "title": "日志详情" - } - }, "table": { "empty-text": "暂无日志信息", "label": { diff --git a/src/locales/zh-cht.json b/src/locales/zh-cht.json index 74575e33..12e44ce4 100644 --- a/src/locales/zh-cht.json +++ b/src/locales/zh-cht.json @@ -1,15 +1,111 @@ { "_name": "繁體中文", + "layout": { + "header-aside": { + "header-fullscreen": { + "active": "全屏", + "exit": "退出全屏" + }, + "header-log": { + "empty": "沒有日誌或異常", + "error-length": "包含 {length} 個異常", + "log-length": "{length} 條日誌" + }, + "header-size": { + "options": { + "default": "默認", + "medium": "中", + "mini": "最小", + "small": "小" + } + }, + "header-theme": { + "dialog": { + "title": "主題" + }, + "list": { + "button": { + "is-active": "已激活", + "select": "選擇" + }, + "column": { + "label": { + "preview": "預覽" + } + } + }, + "tooltip": { + "content": "主題" + } + }, + "header-user": { + "hello": "你好", + "log-off": "註銷" + }, + "menu-item": { + "label-default": "未命名菜單" + }, + "menu-side": { + "empty": "沒有側欄菜單" + }, + "message": { + "warning": { + "temporary-menu": "臨時菜單" + } + }, + "panel-search": { + "autocomplete-placeholder": "搜索頁面", + "tip": "你可以使用快捷鍵 {open} 喚醒搜索面板,按 {close} 關閉" + }, + "tabs": { + "close-all": "全部關閉", + "close-left": "關閉左側", + "close-other": "關閉其它", + "close-right": "關閉右側", + "label-default": "未命名" + } + } + }, "public": { + "confirm": { + "special": { + "logout": { + "button": { + "cancel": "放棄", + "confirm": "確定註銷" + }, + "message": "註銷當前賬戶嗎? 打開的標籤頁和用戶設置將會被保存。", + "title": "確認操作" + } + } + }, "message": { "error": { "form": { "invalid": "表單校驗失敗,請檢查" + }, + "handle": { + "invalid": "無效的操作" + } + }, + "special": { + "logout": { + "cancel": "放棄註銷用戶" } } }, "notify": { "special": { + "component-size": { + "changed": { + "message": "全局組件尺寸已經變更", + "title": "提示" + } + }, + "show-log": { + "message": "完整的日誌內容已經打印到控制台", + "title": "日誌詳情" + }, "upload": { "error": { "message": "數據上傳失敗", @@ -93,12 +189,6 @@ } }, "log": { - "notify": { - "more": { - "message": "完整的日誌內容已經打印到控制台", - "title": "日誌詳情" - } - }, "table": { "empty-text": "暫無日誌信息", "label": { diff --git a/src/store/modules/d2admin/modules/account.js b/src/store/modules/d2admin/modules/account.js index c05da5d9..1ab37af5 100644 --- a/src/store/modules/d2admin/modules/account.js +++ b/src/store/modules/d2admin/modules/account.js @@ -2,6 +2,7 @@ import { Message, MessageBox } from 'element-ui' import util from '@/libs/util.js' import router from '@/router' import { AccountLogin } from '@api/sys.login' +import i18n from '../../../../i18n' export default { namespaced: true, @@ -69,9 +70,9 @@ export default { // 判断是否需要确认 if (confirm) { commit('d2admin/gray/set', true, { root: true }) - MessageBox.confirm('注销当前账户吗? 打开的标签页和用户设置将会被保存。', '确认操作', { - confirmButtonText: '确定注销', - cancelButtonText: '放弃', + MessageBox.confirm(i18n.t('public.confirm.special.logout.message'), i18n.t('public.confirm.special.logout.title'), { + confirmButtonText: i18n.t('public.confirm.special.logout.button.confirm'), + cancelButtonText: i18n.t('public.confirm.special.logout.button.cancel'), type: 'warning' }) .then(() => { @@ -81,7 +82,7 @@ export default { .catch(() => { commit('d2admin/gray/set', false, { root: true }) Message({ - message: '放弃注销用户' + message: i18n.t('public.message.special.logout.cancel') }) }) } else { diff --git a/src/views/system/log/index.vue b/src/views/system/log/index.vue index 9b7eeb27..7d1d8ea6 100644 --- a/src/views/system/log/index.vue +++ b/src/views/system/log/index.vue @@ -89,8 +89,8 @@ export default { // Print all information from a log to the console this.$notify({ type: 'info', - title: this.$t('views.system.log.notify.more.title'), - message: this.$t('views.system.log.notify.more.message') + title: this.$t('public.notify.special.show-log.title'), + message: this.$t('public.notify.special.show-log.message') }) this.$log.capsule('D2Admin', 'handleShowMore', 'primary') console.group(log.message)