From 79f266bbda00c7418702811f0cb5a259392e9f73 Mon Sep 17 00:00:00 2001 From: wangdan Date: Fri, 17 Mar 2023 15:51:02 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=9B=BD=E9=99=85?= =?UTF-8?q?=E5=8C=96=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/lang/modules/en.ts | 8 +++++++- frontend/src/lang/modules/zh.ts | 7 ++++++- frontend/src/main.ts | 5 +++-- 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/frontend/src/lang/modules/en.ts b/frontend/src/lang/modules/en.ts index 7f9c76330..260619ee7 100644 --- a/frontend/src/lang/modules/en.ts +++ b/frontend/src/lang/modules/en.ts @@ -1,4 +1,5 @@ -export default { +import fit2cloudEnLocale from 'fit2cloud-ui-plus/src/locale/lang/en'; +const message = { commons: { true: 'true', false: 'false', @@ -1164,3 +1165,8 @@ export default { cookieBlockList: 'Cookie Blacklist', }, }; + +export default { + ...fit2cloudEnLocale, + ...message, +}; diff --git a/frontend/src/lang/modules/zh.ts b/frontend/src/lang/modules/zh.ts index e5db67797..0456c9dcf 100644 --- a/frontend/src/lang/modules/zh.ts +++ b/frontend/src/lang/modules/zh.ts @@ -1,4 +1,5 @@ -export default { +import fit2cloudZhLocale from 'fit2cloud-ui-plus/src/locale/lang/zh-cn'; +const message = { commons: { true: '是', false: '否', @@ -1167,3 +1168,7 @@ export default { cookieBlockList: 'Cookie 黑名单', }, }; +export default { + ...fit2cloudZhLocale, + ...message, +}; diff --git a/frontend/src/main.ts b/frontend/src/main.ts index 8c561811e..da1a8c92e 100644 --- a/frontend/src/main.ts +++ b/frontend/src/main.ts @@ -15,11 +15,12 @@ import SvgIcon from './components/svg-icon/svg-icon.vue'; import ElementPlus from 'element-plus'; import Fit2CloudPlus from 'fit2cloud-ui-plus'; import * as Icons from '@element-plus/icons-vue'; - const app = createApp(App); app.component('SvgIcon', SvgIcon); app.use(ElementPlus); -app.use(Fit2CloudPlus); + +app.use(Fit2CloudPlus, { locale: I18n.global.messages.value[localStorage.getItem('lang') || 'zh'] }); + Object.keys(Icons).forEach((key) => { app.component(key, Icons[key as keyof typeof Icons]); });