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

packages/locales/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vben/locales",
-  "version": "5.1.2",
+  "version": "5.2.0",
   "homepage": "https://github.com/vbenjs/vue-vben-admin",
   "bugs": "https://github.com/vbenjs/vue-vben-admin/issues",
   "repository": {
@@ -21,6 +21,7 @@
   },
   "dependencies": {
     "@intlify/core-base": "^9.14.0",
+    "@vben-core/composables": "workspace:*",
     "vue": "^3.4.38",
     "vue-i18n": "^9.14.0"
   }

packages/locales/src/i18n.ts

@@ -10,6 +10,8 @@ import type {
 import { type App, unref } from 'vue';
 import { createI18n } from 'vue-i18n';
 
+import { useSimpleLocale } from '@vben-core/composables';
+
 const i18n = createI18n({
   globalInjection: true,
   legacy: false,
@@ -19,6 +21,8 @@ const i18n = createI18n({
 
 const modules = import.meta.glob('./langs/*.json');
 
+const { setSimpleLocale } = useSimpleLocale();
+
 const localesMap = loadLocalesMap(modules);
 
 let loadMessages: LoadMessageFn;
@@ -75,6 +79,7 @@ async function loadLocaleMessages(lang: SupportedLanguagesType) {
   if (unref(i18n.global.locale) === lang) {
     return setI18nLanguage(lang);
   }
+  setSimpleLocale(lang);
 
   const message = await localesMap[lang]?.();