fix: i18n language detection

hez2010 · hez2010 · commit f1fed1b840fe · 2024-02-27T16:08:15.000+09:00
diff --git a/src/GZCTF/ClientApp/src/main.tsx b/src/GZCTF/ClientApp/src/main.tsx
@@ -1,4 +1,5 @@
 import { App } from '@App'
+import { LanguageMap, SupportedLanguages, defaultLanguage } from '@Utils/I18n'
 import i18n from 'i18next'
 import LanguageDetector from 'i18next-browser-languagedetector'
 import { StrictMode } from 'react'
@@ -7,17 +8,34 @@ import { initReactI18next } from 'react-i18next'
 import { BrowserRouter as Router } from 'react-router-dom'
 import resources from 'virtual:i18next-loader'
 
+const convertLanguage = (language: string): SupportedLanguages => {
+  const normalizeLanguage = (language: string) => {
+    let sliceIndex = language.indexOf('-')
+    if (sliceIndex === -1) sliceIndex = language.indexOf('_')
+    if (sliceIndex === -1) sliceIndex = language.length
+    return language.toLowerCase().slice(0, sliceIndex)
+  }
+  const normalizedLanguage = normalizeLanguage(language)
+
+  const matchedLanguage = Object.keys(LanguageMap).filter((lang) => normalizeLanguage(lang) === normalizedLanguage)
+  if (matchedLanguage.length > 0) {
+    return matchedLanguage[0] as SupportedLanguages
+  }
+
+  return defaultLanguage
+}
+
 i18n
   .use(LanguageDetector)
   .use(initReactI18next)
   .init({
     resources,
-    fallbackLng: 'zh_CN',
+    fallbackLng: defaultLanguage,
     interpolation: {
       escapeValue: false,
     },
     detection: {
-      convertDetectedLanguage: 'Iso15897',
+      convertDetectedLanguage: convertLanguage,
     },
   })
 
diff --git a/src/GZCTF/ClientApp/src/utils/I18n.tsx b/src/GZCTF/ClientApp/src/utils/I18n.tsx
@@ -9,6 +9,8 @@ export const LanguageMap = {
   ja_JP: '日本語',
 }
 
+export const defaultLanguage = 'zh_CN'
+
 export type SupportedLanguages = keyof typeof LanguageMap
 
 export const useLanguage = () => {
@@ -32,12 +34,12 @@ export const useLanguage = () => {
     if (supportedLanguages.includes(lang)) {
       setLanguageInner(lang)
     } else {
-      console.warn(`Language ${lang} is not supported, fallback to zh_CN`)
-      setLanguageInner('zh_CN')
+      console.warn(`Language ${lang} is not supported, fallback to ${defaultLanguage}`)
+      setLanguageInner(defaultLanguage)
     }
   }
 
   return { language, setLanguage, supportedLanguages }
 }
 
-export let apiLanguage: string = 'zh-CN'
+export let apiLanguage: string = defaultLanguage

Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,8 @@ export const LanguageMap = {`
`9`	`9`	`ja_JP: '日本語',`
`10`	`10`	`}`
`11`	`11`
	`12`	`+export const defaultLanguage = 'zh_CN'`
	`13`	`+`
`12`	`14`	`export type SupportedLanguages = keyof typeof LanguageMap`
`13`	`15`
`14`	`16`	`export const useLanguage = () => {`
`@@ -32,12 +34,12 @@ export const useLanguage = () => {`
`32`	`34`	`if (supportedLanguages.includes(lang)) {`
`33`	`35`	`setLanguageInner(lang)`
`34`	`36`	`} else {`
`35`		- console.warn(`Language ${lang} is not supported, fallback to zh_CN`)
`36`		`- setLanguageInner('zh_CN')`
	`37`	+ console.warn(`Language ${lang} is not supported, fallback to ${defaultLanguage}`)
	`38`	`+ setLanguageInner(defaultLanguage)`
`37`	`39`	`}`
`38`	`40`	`}`
`39`	`41`
`40`	`42`	`return { language, setLanguage, supportedLanguages }`
`41`	`43`	`}`
`42`	`44`
`43`		`-export let apiLanguage: string = 'zh-CN'`
	`45`	`+export let apiLanguage: string = defaultLanguage`