Merge pull request #136 from mebtte/beta

refactor i18n

Author: mebtte

apps/cli/src/i18n/constants.ts

@@ -1,3 +1,3 @@
-import enUS from './en_us';
+import en from './en';
 
-export type Key = keyof typeof enUS;
+export type Key = keyof typeof en;

apps/cli/src/i18n/en_us.ts apps/cli/src/i18n/en.tsapps/cli/src/i18n/en_us.ts renamed to apps/cli/src/i18n/en.ts

@@ -1,13 +1,11 @@
 import { Language } from '#/constants';
 import { Key } from './constants';
-import enUS from './en_us';
+import en from './en';
 import zhHans from './zh_hans';
-import ja from './ja';
 
-const LANGUAGE_MAP: Record<Language, typeof enUS> = {
-  [Language.EN_US]: enUS,
+const LANGUAGE_MAP: Record<Language, typeof en> = {
+  [Language.EN]: en,
   [Language.ZH_HANS]: zhHans,
-  [Language.JA]: ja,
 };
 
 export function t(key: Key, language: Language, ...args: string[]) {
@@ -22,4 +20,4 @@ export function t(key: Key, language: Language, ...args: string[]) {
   return value;
 }
 
-export { Key };
+export type { Key };

apps/cli/src/i18n/index.ts

@@ -10,11 +10,6 @@ function getInitialLanguage() {
     case 'zh-cn': {
       return Language.ZH_HANS;
     }
-
-    case 'ja': {
-      return Language.JA;
-    }
-
     default: {
       return DEFAULT_LANGUAGE;
     }

apps/cli/src/i18n/ja.ts

@@ -1,3 +1,3 @@
-import enUS from './en_us';
+import en from './en';
 
-export type Key = keyof typeof enUS;
+export type Key = keyof typeof en;

apps/pwa/src/global_states/setting.ts

@@ -8,12 +8,8 @@ switch (useSetting.getState().language) {
     ({ default: translation } = await import('./zh_hans'));
     break;
   }
-  case Language.JA: {
-    ({ default: translation } = await import('./ja'));
-    break;
-  }
   default: {
-    ({ default: translation } = await import('./en_us'));
+    ({ default: translation } = await import('./en'));
   }
 }
 
@@ -35,9 +31,8 @@ export const LANGUAGE_MAP: Record<
     label: string;
   }
 > = {
-  [Language.EN_US]: { label: 'English(US)' },
+  [Language.EN]: { label: 'English' },
   [Language.ZH_HANS]: { label: '简体中文' },
-  [Language.JA]: { label: '日本語' },
 };
 
 export type { Key };

apps/pwa/src/i18n/constants.ts

@@ -97,11 +97,10 @@ export const SINGER_MODIFY_RECORD_TTL = 1000 * 60 * 60 * 24 * 180;
 
 export enum Language {
   ZH_HANS = 'zh-hans',
-  EN_US = 'en-us',
-  JA = 'ja',
+  EN = 'en',
 }
 export const LANGUAGES = Object.values(Language);
-export const DEFAULT_LANGUAGE = Language.EN_US;
+export const DEFAULT_LANGUAGE = Language.EN;
 
 export enum CommonQuery {
   VERSION = '__v',