From f32a7105c38ee455c4b165d48651ef19fc6948db Mon Sep 17 00:00:00 2001
From: ahaos <8406649+lhailgl@user.noreply.gitee.com>
Date: 星期三, 13 十二月 2023 18:35:55 +0800
Subject: [PATCH] !68 修复升级依赖带来的问题 * Merge remote-tracking branch 'origin/dev' into dev * 升级依赖 * Merge remote-tracking branch 'origin/ts' into ts * 升级依赖 * Merge branch 'dev' of gitee.com:JavaLionLi/plus-ui into ts * 升级依赖 * !61 fix: 删除重复环境变量ElUploadInstance * fix: 删除重复环境变量ElUploadInstance
---
src/lang/index.ts | 47 +++++++++++++++++++----------------------------
1 files changed, 19 insertions(+), 28 deletions(-)
diff --git a/src/lang/index.ts b/src/lang/index.ts
index 1048211..071599e 100644
--- a/src/lang/index.ts
+++ b/src/lang/index.ts
@@ -2,44 +2,35 @@
import { createI18n } from 'vue-i18n';
// 鏈湴璇█鍖�
-import enLocale from './en';
-import zhCnLocale from './zh-cn';
+import enUSLocale from './en_US';
+import zhCNLocale from './zh_CN';
+import { LanguageEnum } from '@/enums/LanguageEnum';
const messages = {
- 'zh-cn': {
- ...zhCnLocale
- },
- en: {
- ...enLocale
- }
+ zh_CN: {
+ ...zhCNLocale
+ },
+ en_US: {
+ ...enUSLocale
+ }
};
/**
- * 鑾峰彇褰撳墠绯荤粺浣跨敤璇█瀛楃涓�
- *
+ * 鑾峰彇褰撳墠璇█
* @returns zh-cn|en ...
*/
-export const getLanguage = () => {
- // 鏈湴缂撳瓨鑾峰彇
- let language = localStorage.getItem('language');
- if (language) {
- return language;
- }
- // 娴忚鍣ㄤ娇鐢ㄨ瑷�
- language = navigator.language.toLowerCase();
- const locales = Object.keys(messages);
- for (const locale of locales) {
- if (language.indexOf(locale) > -1) {
- return locale;
- }
- }
- return 'zh-cn';
+export const getLanguage = (): LanguageEnum => {
+ const language = useStorage<LanguageEnum>('language', LanguageEnum.zh_CN);
+ if (language.value) {
+ return language.value;
+ }
+ return LanguageEnum.zh_CN;
};
const i18n = createI18n({
- legacy: false,
- locale: getLanguage(),
- messages: messages
+ legacy: false,
+ locale: getLanguage(),
+ messages
});
export default i18n;
--
Gitblit v1.9.3