diff --git a/hippo4j-server/hippo4j-ui/src/layout/components/Navbar.vue b/hippo4j-server/hippo4j-ui/src/layout/components/Navbar.vue index 71b97908..283431ff 100755 --- a/hippo4j-server/hippo4j-ui/src/layout/components/Navbar.vue +++ b/hippo4j-server/hippo4j-ui/src/layout/components/Navbar.vue @@ -32,7 +32,7 @@ Dashboard - Log Out + {{ $t('system.logOut') }} diff --git a/hippo4j-server/hippo4j-ui/src/locale/config.js b/hippo4j-server/hippo4j-ui/src/locale/config.js index 2f969699..3262ac6d 100644 --- a/hippo4j-server/hippo4j-ui/src/locale/config.js +++ b/hippo4j-server/hippo4j-ui/src/locale/config.js @@ -5,8 +5,10 @@ import elEn from 'element-ui/lib/locale/lang/en' import zh from './lang/zh' import en from './lang/en' +const lang = localStorage.getItem('locale_lang') + export const i18nConfig = { - locale: 'en', // 默认语种 + locale: lang || 'en', // 默认语种 messages: { zh: { ...zh, ...elZh }, // 中文包 en: { ...en, ...elEn } // 英文包 diff --git a/hippo4j-server/hippo4j-ui/src/locale/lang/en.js b/hippo4j-server/hippo4j-ui/src/locale/lang/en.js index 5ea60925..f581c3bb 100644 --- a/hippo4j-server/hippo4j-ui/src/locale/lang/en.js +++ b/hippo4j-server/hippo4j-ui/src/locale/lang/en.js @@ -1,3 +1,31 @@ export default { + // 系统 + system: { + login: 'Login Form', + username: 'Username', + password: 'Password', + logOut: 'Log Out' + }, + + // 公共 + common: { + search: 'Search', + addition: 'Addition', + serialNumber: 'Serial Number', + operation: 'Operation', + edit: 'Edit', + delete: 'Delete', + cancel: 'Cancel', + confirm: 'Confirm' + }, + + // 线程池 + threadPool: { + tenant: 'Tenant', + project: 'Project', + threadPool: 'Thread Pool', + + + } } diff --git a/hippo4j-server/hippo4j-ui/src/locale/lang/zh.js b/hippo4j-server/hippo4j-ui/src/locale/lang/zh.js index 03048022..f12d91c6 100644 --- a/hippo4j-server/hippo4j-ui/src/locale/lang/zh.js +++ b/hippo4j-server/hippo4j-ui/src/locale/lang/zh.js @@ -1,3 +1,28 @@ export default { + // 系统 + system: { + login: '登 陆', + username: '用户名', + password: '密码', + logOut: '注销' + }, + // 公共 + common: { + search: '搜索', + addition: '添加', + serialNumber: '序号', + operation: '操作', + edit: '编辑', + delete: '删除', + cancel: '取消', + confirm: '确认' + }, + + // 线程池 + threadPool: { + tenant: '租户', + project: '项目', + threadPool: '线程池', + } } diff --git a/hippo4j-server/hippo4j-ui/src/locale/langChange.vue b/hippo4j-server/hippo4j-ui/src/locale/langChange.vue index fcb87737..c14dbe3c 100644 --- a/hippo4j-server/hippo4j-ui/src/locale/langChange.vue +++ b/hippo4j-server/hippo4j-ui/src/locale/langChange.vue @@ -26,6 +26,10 @@ export default { currentLang: '' } }, + mounted() { + const lang = this.$i18n.locale + this.currentLang = lang || null + }, computed: { currentLangName() { const langItem = this.langSelectList.find(item => item.lang === this.currentLang) @@ -36,6 +40,8 @@ export default { // 选择语言 selectedLang(value) { this.currentLang = value + this.$i18n.locale = value + localStorage.setItem('locale_lang', value) } } } @@ -44,10 +50,13 @@ export default { .lang-drop-wrap{ height: 100%; margin-right: 15px; - .dropdown-item-text{ - &[data-active=true] { - color: var(--jjext-color-dropdown-text) !important; - } + .el-dropdown-link{ + cursor: pointer; + } + } + .dropdown-item-text{ + &[data-active=true] { + color: var(--jjext-color-dropdown-text) !important; } } diff --git a/hippo4j-server/hippo4j-ui/src/views/hippo4j/threadpool/index.vue b/hippo4j-server/hippo4j-ui/src/views/hippo4j/threadpool/index.vue index 267cc30a..f6505f24 100755 --- a/hippo4j-server/hippo4j-ui/src/views/hippo4j/threadpool/index.vue +++ b/hippo4j-server/hippo4j-ui/src/views/hippo4j/threadpool/index.vue @@ -3,7 +3,7 @@
- 搜索 + {{ $t('common.search') }} - 添加 + {{ $t('common.addition') }}
- + @@ -129,16 +129,16 @@ @@ -327,9 +327,9 @@ diff --git a/hippo4j-server/hippo4j-ui/src/views/login/index.vue b/hippo4j-server/hippo4j-ui/src/views/login/index.vue index 19fa52d5..7710cf18 100755 --- a/hippo4j-server/hippo4j-ui/src/views/login/index.vue +++ b/hippo4j-server/hippo4j-ui/src/views/login/index.vue @@ -9,7 +9,7 @@ label-position="left" >
-

Login Form

+

{{ $t('system.login') }}

@@ -19,7 +19,7 @@