by2025/admin-vben5
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' of https://github.com/vbenjs/vue-vben-admin

Browse Source
This commit is contained in:
dap
2024-08-21 19:45:28 +08:00
parent b1a1bad9ee c3631ef555
commit cce35ec6c4
33 changed files with 286 additions and 254 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
packages/locales/src/i18n.ts
View File

@@ -10,8 +10,6 @@ import type {
import { type App, unref } from 'vue';
import { createI18n } from 'vue-i18n';
const loadedLanguages = new Set<string>();
const i18n = createI18n({
globalInjection: true,
legacy: false,
@@ -78,10 +76,6 @@ async function loadLocaleMessages(lang: SupportedLanguagesType) {
return setI18nLanguage(lang);
}
if (loadedLanguages.has(lang)) {
return setI18nLanguage(lang);
}
const message = await localesMap[lang]?.();
if (message?.default) {
@@ -91,7 +85,6 @@ async function loadLocaleMessages(lang: SupportedLanguagesType) {
const mergeMessage = await loadMessages(lang);
i18n.global.mergeLocaleMessage(lang, mergeMessage);
loadedLanguages.add(lang);
return setI18nLanguage(lang);
}