Fix Chinese language (spacedriveapp#2050)

* fix chinese * remove console.log
Rocky43007 · Feb 4, 2024 · 2ff1ffc · 2ff1ffc
1 parent d475153
commit 2ff1ffc
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 6 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/interface/app/$libraryId/settings/client/general.tsx b/interface/app/$libraryId/settings/client/general.tsx
@@ -28,8 +28,8 @@ const LANGUAGE_OPTIONS = [
 	{ value: 'es', label: 'Español' },
 	{ value: 'fr', label: 'Français' },
 	{ value: 'tr', label: 'Türkçe' },
-	{ value: 'zh-CN', label: '中文（简体）' },
-	{ value: 'zh-TW', label: '中文（繁體）' }
+	{ value: 'zh_CN', label: '中文（简体）' },
+	{ value: 'zh_TW', label: '中文（繁體）' }
 ];
 
 export const Component = () => {
@@ -201,8 +201,8 @@ export const Component = () => {
 					<Select
 						value={i18n.language}
 						onChange={(e) => {
-							// add "i18nextLng" key to localStorage and set it to the selected language
 							i18n.changeLanguage(e);
+							// add "i18nextLng" key to localStorage and set it to the selected language
 							localStorage.setItem('i18nextLng', e);
 						}}
 						containerClassName="h-[30px] whitespace-nowrap"

diff --git a/interface/app/I18n.ts b/interface/app/I18n.ts
@@ -13,8 +13,14 @@ i18n
 	// for all options read: https://www.i18next.com/overview/configuration-options
 	.init({
 		resources,
-		load: 'languageOnly',
+		detection: {
+			// We need to convert due to ES syntactical rules (e.g. ch-TW -> ch_TW) and vite's virtual module stuff -_-
+			// NOTE: This whole issue sounds very error-prone...
+			convertDetectedLanguage: (lng) => lng.replace('-', '_')
+		},
+		// debug: true,
 		fallbackLng: 'en',
+		nonExplicitSupportedLngs: true,
 		ns: ['common'],
 		fallbackNS: 'common',
 		defaultNS: 'common'