From cf7a55b3e8ab98b8bf578f724d3e6674ab5d87f7 Mon Sep 17 00:00:00 2001 From: Om Raut <33827410+om2137@users.noreply.github.com> Date: Thu, 21 Sep 2023 23:15:47 +0530 Subject: [PATCH] fix: some english words when switched to chinese. (#4448) --- .../general-setting/appearance/index.tsx | 17 ++++++++++++++++- packages/i18n/src/resources/en.json | 3 +++ packages/i18n/src/resources/zh-Hans.json | 5 +++++ packages/i18n/src/resources/zh-Hant.json | 3 +++ 4 files changed, 27 insertions(+), 1 deletion(-) diff --git a/apps/core/src/components/affine/setting-modal/general-setting/appearance/index.tsx b/apps/core/src/components/affine/setting-modal/general-setting/appearance/index.tsx index 77b2e98fff..7fd3937f17 100644 --- a/apps/core/src/components/affine/setting-modal/general-setting/appearance/index.tsx +++ b/apps/core/src/components/affine/setting-modal/general-setting/appearance/index.tsx @@ -46,6 +46,7 @@ export const ThemeSettings = () => { }; const FontFamilySettings = () => { + const t = useAFFiNEI18N(); const [appSettings, setAppSettings] = useAppSetting(); return ( { )} > {fontStyleOptions.map(({ key, value }) => { + let font = ''; + switch (key) { + case 'Sans': + font = t['com.affine.appearanceSettings.fontStyle.sans'](); + break; + case 'Serif': + font = t['com.affine.appearanceSettings.fontStyle.serif'](); + break; + case 'Mono': + font = t[`com.affine.appearanceSettings.fontStyle.mono`](); + break; + default: + break; + } return ( { fontFamily: value, }} > - {key} + {font} ); })} diff --git a/packages/i18n/src/resources/en.json b/packages/i18n/src/resources/en.json index 5008835ee4..786cf633ca 100644 --- a/packages/i18n/src/resources/en.json +++ b/packages/i18n/src/resources/en.json @@ -41,6 +41,9 @@ "com.affine.appearanceSettings.dateFormat.title": "Date Format", "com.affine.appearanceSettings.font.description": "Choose your font style", "com.affine.appearanceSettings.font.title": "Font Style", + "com.affine.appearanceSettings.fontStyle.sans": "Sans", + "com.affine.appearanceSettings.fontStyle.serif": "Serif", + "com.affine.appearanceSettings.fontStyle.mono": "Mono", "com.affine.appearanceSettings.fullWidth.description": "Maximum display of content within a page.", "com.affine.appearanceSettings.fullWidth.title": "Full width Layout", "com.affine.appearanceSettings.language.description": "Select the language for the interface.", diff --git a/packages/i18n/src/resources/zh-Hans.json b/packages/i18n/src/resources/zh-Hans.json index c571c90f8f..d568708fed 100644 --- a/packages/i18n/src/resources/zh-Hans.json +++ b/packages/i18n/src/resources/zh-Hans.json @@ -39,6 +39,11 @@ "com.affine.appearanceSettings.date.title": "日期", "com.affine.appearanceSettings.dateFormat.description": "定制您的日期格式。", "com.affine.appearanceSettings.dateFormat.title": "日期格式", + "com.affine.appearanceSettings.font.description": "选择你的字体风格", + "com.affine.appearanceSettings.font.title": "字体", + "com.affine.appearanceSettings.fontStyle.sans": "无衬线", + "com.affine.appearanceSettings.fontStyle.serif": "衬线", + "com.affine.appearanceSettings.fontStyle.mono": "等宽", "com.affine.appearanceSettings.fullWidth.description": "页面内容的最大显示量。", "com.affine.appearanceSettings.fullWidth.title": "全宽布局", "com.affine.appearanceSettings.language.description": "选择界面语言。", diff --git a/packages/i18n/src/resources/zh-Hant.json b/packages/i18n/src/resources/zh-Hant.json index 0b3246e4b2..cabe01ec6c 100644 --- a/packages/i18n/src/resources/zh-Hant.json +++ b/packages/i18n/src/resources/zh-Hant.json @@ -41,6 +41,9 @@ "com.affine.appearanceSettings.dateFormat.title": "日期格式", "com.affine.appearanceSettings.font.description": "選擇你的字體風格", "com.affine.appearanceSettings.font.title": "字形", + "com.affine.appearanceSettings.fontStyle.sans": "無襯線", + "com.affine.appearanceSettings.fontStyle.serif": "襯線", + "com.affine.appearanceSettings.fontStyle.mono": "等寬", "com.affine.appearanceSettings.fullWidth.description": "頁面內內容的最大顯示量。", "com.affine.appearanceSettings.fullWidth.title": "全寬佈局", "com.affine.appearanceSettings.language.description": "選擇介面語言。",