From 31da01bdd1e4fe8fb8eec41f401d73bcf6cc18b7 Mon Sep 17 00:00:00 2001
From: ahao <liuhaoai545@gmail.com>
Date: 星期六, 06 一月 2024 17:27:01 +0800
Subject: [PATCH] fix https://gitee.com/dromara/RuoYi-Vue-Plus/issues/I8TMAI
---
src/lang/index.ts | 35 +++++++++++++----------------------
1 files changed, 13 insertions(+), 22 deletions(-)
diff --git a/src/lang/index.ts b/src/lang/index.ts
index 8fdf19e..071599e 100644
--- a/src/lang/index.ts
+++ b/src/lang/index.ts
@@ -2,38 +2,29 @@
import { createI18n } from 'vue-i18n';
// 鏈湴璇█鍖�
-import enLocale from './en';
-import zhCnLocale from './zh-cn';
-import Cookies from 'js-cookie';
+import enUSLocale from './en_US';
+import zhCNLocale from './zh_CN';
+import { LanguageEnum } from '@/enums/LanguageEnum';
const messages = {
- 'zh-cn': {
- ...zhCnLocale
+ zh_CN: {
+ ...zhCNLocale
},
- en: {
- ...enLocale
+ en_US: {
+ ...enUSLocale
}
};
/**
- * 鑾峰彇褰撳墠绯荤粺浣跨敤璇█瀛楃涓�
+ * 鑾峰彇褰撳墠璇█
* @returns zh-cn|en ...
*/
-export const getLanguage = () => {
- // 鏈湴缂撳瓨鑾峰彇
- let language = Cookies.get('language');
- if (language) {
- return language;
+export const getLanguage = (): LanguageEnum => {
+ const language = useStorage<LanguageEnum>('language', LanguageEnum.zh_CN);
+ if (language.value) {
+ return language.value;
}
- // 娴忚鍣ㄤ娇鐢ㄨ瑷�
- language = navigator.language.toLowerCase();
- const locales = Object.keys(messages);
- for (const locale of locales) {
- if (language.indexOf(locale) > -1) {
- return locale;
- }
- }
- return 'zh-cn';
+ return LanguageEnum.zh_CN;
};
const i18n = createI18n({
--
Gitblit v1.9.3