From 1592cd0b0bf93d8f5ff592792d3d2b8b078046e0 Mon Sep 17 00:00:00 2001
From: Charles Zhao <charleszhao@silverhand.io>
Date: Wed, 20 Jul 2022 00:55:45 +0800
Subject: [PATCH] refactor(console): use non-i18n raw string in language select
 box

---
 packages/console/src/pages/Settings/index.tsx   | 13 ++-----------
 .../components/LanguagesForm.tsx                | 17 +----------------
 packages/phrases/src/index.ts                   |  2 +-
 .../en/translation/admin-console/settings.ts    |  2 --
 .../en/translation/admin-console/sign-in-exp.ts |  4 ----
 .../zh-cn/translation/admin-console/settings.ts |  2 --
 .../translation/admin-console/sign-in-exp.ts    |  4 ----
 packages/phrases/src/types.ts                   |  5 +++++
 8 files changed, 9 insertions(+), 40 deletions(-)

diff --git a/packages/console/src/pages/Settings/index.tsx b/packages/console/src/pages/Settings/index.tsx
index d514f1273..0fd31faa8 100644
--- a/packages/console/src/pages/Settings/index.tsx
+++ b/packages/console/src/pages/Settings/index.tsx
@@ -1,4 +1,4 @@
-import { Language } from '@logto/phrases';
+import { languageOptions } from '@logto/phrases';
 import { AppearanceMode } from '@logto/schemas';
 import classNames from 'classnames';
 import { Controller, useForm } from 'react-hook-form';
@@ -58,16 +58,7 @@ const Settings = () => {
                 render={({ field: { value, onChange } }) => (
                   <Select
                     value={value ?? defaultLanguage}
-                    options={[
-                      {
-                        value: Language.English,
-                        title: t('settings.language_english'),
-                      },
-                      {
-                        value: Language.Chinese,
-                        title: t('settings.language_chinese'),
-                      },
-                    ]}
+                    options={languageOptions}
                     onChange={onChange}
                   />
                 )}
diff --git a/packages/console/src/pages/SignInExperience/components/LanguagesForm.tsx b/packages/console/src/pages/SignInExperience/components/LanguagesForm.tsx
index 83cd53a94..08b234537 100644
--- a/packages/console/src/pages/SignInExperience/components/LanguagesForm.tsx
+++ b/packages/console/src/pages/SignInExperience/components/LanguagesForm.tsx
@@ -1,5 +1,4 @@
-import { Language } from '@logto/phrases';
-import { useMemo } from 'react';
+import { languageOptions } from '@logto/phrases';
 import { Controller, useFormContext } from 'react-hook-form';
 import { useTranslation } from 'react-i18next';
 
@@ -15,20 +14,6 @@ const LanguagesForm = () => {
   const { watch, control } = useFormContext<SignInExperienceForm>();
   const mode = watch('languageInfo.mode');
 
-  const languageOptions = useMemo(
-    () => [
-      {
-        value: Language.English,
-        title: t('sign_in_exp.others.languages.languages.english'),
-      },
-      {
-        value: Language.Chinese,
-        title: t('sign_in_exp.others.languages.languages.chinese'),
-      },
-    ],
-    [t]
-  );
-
   return (
     <>
       <div className={styles.title}>{t('sign_in_exp.others.languages.title')}</div>
diff --git a/packages/phrases/src/index.ts b/packages/phrases/src/index.ts
index ed1684b2d..27227704b 100644
--- a/packages/phrases/src/index.ts
+++ b/packages/phrases/src/index.ts
@@ -4,7 +4,7 @@ import en from './locales/en';
 import zhCN from './locales/zh-cn';
 import { Resource, Language } from './types';
 
-export { Language } from './types';
+export { Language, languageOptions } from './types';
 export type Translation = typeof en.translation;
 export type Errors = typeof en.errors;
 export type LogtoErrorCode = NormalizeKeyPaths<Errors>;
diff --git a/packages/phrases/src/locales/en/translation/admin-console/settings.ts b/packages/phrases/src/locales/en/translation/admin-console/settings.ts
index a78f82d4e..967c8a542 100644
--- a/packages/phrases/src/locales/en/translation/admin-console/settings.ts
+++ b/packages/phrases/src/locales/en/translation/admin-console/settings.ts
@@ -6,8 +6,6 @@ const settings = {
   },
   custom_domain: 'Custom domain',
   language: 'Language',
-  language_english: 'English',
-  language_chinese: 'Chinese',
   appearance: 'Appearance',
   appearance_system: 'Sync with system',
   appearance_light: 'Light mode',
diff --git a/packages/phrases/src/locales/en/translation/admin-console/sign-in-exp.ts b/packages/phrases/src/locales/en/translation/admin-console/sign-in-exp.ts
index 306778a6f..9271ba06e 100644
--- a/packages/phrases/src/locales/en/translation/admin-console/sign-in-exp.ts
+++ b/packages/phrases/src/locales/en/translation/admin-console/sign-in-exp.ts
@@ -78,10 +78,6 @@ const sign_in_exp = {
       fallback_language_tip:
         'Which language to fall back if Logto finds no proper language phrase-set.',
       fixed_language: 'Fixed language',
-      languages: {
-        english: 'English',
-        chinese: 'Chinese',
-      },
     },
   },
   setup_warning: {
diff --git a/packages/phrases/src/locales/zh-cn/translation/admin-console/settings.ts b/packages/phrases/src/locales/zh-cn/translation/admin-console/settings.ts
index c97efdb9b..fbb8e77f6 100644
--- a/packages/phrases/src/locales/zh-cn/translation/admin-console/settings.ts
+++ b/packages/phrases/src/locales/zh-cn/translation/admin-console/settings.ts
@@ -6,8 +6,6 @@ const settings = {
   },
   custom_domain: '自定义域名',
   language: '语言',
-  language_english: '英语',
-  language_chinese: '中文',
   appearance: '外观',
   appearance_system: '跟随系统',
   appearance_light: '浅色模式',
diff --git a/packages/phrases/src/locales/zh-cn/translation/admin-console/sign-in-exp.ts b/packages/phrases/src/locales/zh-cn/translation/admin-console/sign-in-exp.ts
index 44aad5a32..bbf1f1a7e 100644
--- a/packages/phrases/src/locales/zh-cn/translation/admin-console/sign-in-exp.ts
+++ b/packages/phrases/src/locales/zh-cn/translation/admin-console/sign-in-exp.ts
@@ -74,10 +74,6 @@ const sign_in_exp = {
       fallback_language: '备用语言',
       fallback_language_tip: '如果 Logto 找不到合适的语言包，将回退至哪种语言。',
       fixed_language: '固定语言',
-      languages: {
-        english: '英文',
-        chinese: '中文',
-      },
     },
   },
   setup_warning: {
diff --git a/packages/phrases/src/types.ts b/packages/phrases/src/types.ts
index d62c9e039..16075f44a 100644
--- a/packages/phrases/src/types.ts
+++ b/packages/phrases/src/types.ts
@@ -14,4 +14,9 @@ export enum Language {
   Chinese = 'zh-CN',
 }
 
+export const languageOptions = [
+  { value: Language.English, title: 'English' },
+  { value: Language.Chinese, title: '中文' },
+];
+
 /* eslint-enable @typescript-eslint/consistent-indexed-object-style */