diff --git a/packages/app/src/IntlProvider.tsx b/packages/app/src/IntlProvider.tsx index 1683c7e2..0f25417f 100644 --- a/packages/app/src/IntlProvider.tsx +++ b/packages/app/src/IntlProvider.tsx @@ -3,40 +3,65 @@ import { IntlProvider as ReactIntlProvider } from "react-intl"; import { ReadPreferences } from "State/Login"; import enMessages from "translations/en.json"; -import esMessages from "translations/es.json"; -import zhMessages from "translations/zh.json"; -import jaMessages from "translations/ja.json"; -import frMessages from "translations/fr.json"; -import huMessages from "translations/hu.json"; -import idMessages from "translations/id.json"; -import arMessages from "translations/ar.json"; -import itMessages from "translations/it.json"; +import esMessages from "translations/es_ES.json"; +import zhMessages from "translations/zh_CN.json"; +import twMessages from "translations/zh_TW.json"; +import jaMessages from "translations/ja_JP.json"; +import frMessages from "translations/fr_FR.json"; +import huMessages from "translations/hu_HU.json"; +import idMessages from "translations/id_ID.json"; +import arMessages from "translations/ar_SA.json"; +import itMessages from "translations/it_IT.json"; +import deMessages from "translations/de_DE.json"; +import ruMessages from "translations/ru_RU.json"; -const DEFAULT_LOCALE = "en-US"; +const DefaultLocale = "en-US"; const getMessages = (locale: string) => { const truncatedLocale = locale.toLowerCase().split(/[_-]+/)[0]; - switch (truncatedLocale) { - case "es": - return esMessages; - case "zh": - return zhMessages; - case "ja": - return jaMessages; - case "fr": - return frMessages; - case "hu": - return huMessages; - case "id": - return idMessages; - case "ar": - return arMessages; - case "it": - return itMessages; - default: - return enMessages; - } + const matchLang = (lng: string) => { + switch (lng) { + case "es-ES": + case "es": + return esMessages; + case "zh-CN": + case "zh-Hans-CN": + case "zh": + return zhMessages; + case "zh-TW": + return twMessages; + case "ja-JP": + case "ja": + return jaMessages; + case "fr-FR": + case "fr": + return frMessages; + case "hu-HU": + case "hu": + return huMessages; + case "id-ID": + case "id": + return idMessages; + case "ar-SA": + case "ar": + return arMessages; + case "it-IT": + case "it": + return itMessages; + case "de-DE": + case "de": + return deMessages; + case "ru-RU": + case "ru": + return ruMessages; + case DefaultLocale: + case "en": + return enMessages; + } + }; + + return matchLang(locale) ?? matchLang(truncatedLocale) ?? enMessages; }; export const IntlProvider = ({ children }: { children: ReactNode }) => { @@ -51,5 +76,5 @@ export const IntlProvider = ({ children }: { children: ReactNode }) => { }; export const getLocale = () => { - return (navigator.languages && navigator.languages[0]) || navigator.language || DEFAULT_LOCALE; + return (navigator.languages && navigator.languages[0]) ?? navigator.language ?? DefaultLocale; }; diff --git a/packages/app/src/Pages/settings/Preferences.tsx b/packages/app/src/Pages/settings/Preferences.tsx index 647fa6f5..5f14e35b 100644 --- a/packages/app/src/Pages/settings/Preferences.tsx +++ b/packages/app/src/Pages/settings/Preferences.tsx @@ -40,7 +40,7 @@ const PreferencesPage = () => { ) } style={{ textTransform: "capitalize" }}> - {["en", "ja", "es", "hu", "zh", "fr", "ar", "it", "id"].sort().map(a => ( + {["en", "ja", "es", "hu", "zh-CN", "zh-TW", "fr", "ar", "it", "id", "de", "ru"].sort().map(a => (