refactor: wip

typed-sigterm · Jul 31, 2024 · 4ea32e9 · 4ea32e9
1 parent ec2ac3b
commit 4ea32e9
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 17 deletions.
diff --git a/components/settings/language.vue b/components/settings/language.vue
@@ -10,8 +10,6 @@ const options: DropdownOption[] = [
 ];
 
 function handleSelect(key: string) {
-  if (i18n.locale.value === key)
-    return;
   switchLanguage(i18n, key);
 }
 </script>

diff --git a/i18n.config.ts b/i18n.config.ts
@@ -1,5 +1,10 @@
+import en from './locales/en';
+import zhCN from './locales/zh-CN';
+
 export default defineI18nConfig(() => ({
   fallbackLocale: 'en',
-  missingWarn: false,
-  fallbackWarn: false,
+  messages: {
+    en,
+    'zh-CN': zhCN,
+  },
 }));
diff --git a/nuxt.config.ts b/nuxt.config.ts
@@ -70,14 +70,4 @@ export default defineNuxtConfig({
   },
 
   compatibilityDate: '2024-07-03',
-
-  i18n: {
-    locales: [
-      { code: 'en', file: 'en.ts' },
-      { code: 'zh-CN', file: 'zh-CN.ts' },
-    ],
-    langDir: 'locales',
-    lazy: true,
-    defaultLocale: 'en',
-  },
 });
diff --git a/utils/app.ts b/utils/app.ts
@@ -49,9 +49,9 @@ export const createNotInAppError = () => createError('Please download the app to
 
 export const DEFAULT_LANG = 'en';
 
-export async function switchLanguage(i18n: ReturnType<typeof useI18n>, lang: string) {
-  await i18n.loadLocaleMessages(lang);
-  i18n.setLocale(lang);
+export function switchLanguage(i18n: ReturnType<typeof useI18n>, lang: string) {
+  if (i18n.locale.value !== lang)
+    i18n.setLocale(lang);
   useHead({
     htmlAttrs: { lang },
   });