High performance self-hosted photo and video management solution.
TypeScript backup-toolfluttergoogle-photosgoogle-photos-alternativejavascriptmobile-appnestjsnodejsphoto-galleryphotosphotos-managementself-hostedsveltesveltekittypescriptvideos
fix: chinese browser locales recognition (#29622)
Daniel Dietzler4e25db2989e4
diff --git a/web/src/lib/i18n.spec.ts b/web/src/lib/i18n.spec.tsindex ccc60a835b..ebf2fdfa3b 100644--- a/web/src/lib/i18n.spec.ts+++ b/web/src/lib/i18n.spec.ts@@ -58,5 +58,14 @@ describe('i18n', () => {expect(getClosestAvailableLocale(['sr_Cyrl'], allLocales)).toBe('sr_Cyrl');expect(getClosestAvailableLocale(['zh_Hant'], allLocales)).toBe('zh_Hant');});++ it('should handle language aliases', () => {+ const allLocales = ['zh-Hans', 'zh-Hant'];+ expect(getClosestAvailableLocale(['zh-CN'], allLocales)).toBe('zh-Hans');+ expect(getClosestAvailableLocale(['zh-HK'], allLocales)).toBe('zh-Hant');+ expect(getClosestAvailableLocale(['zh-MO'], allLocales)).toBe('zh-Hant');+ expect(getClosestAvailableLocale(['zh-SG'], allLocales)).toBe('zh-Hans');+ expect(getClosestAvailableLocale(['zh-TW'], allLocales)).toBe('zh-Hant');+ });});});diff --git a/web/src/lib/utils/i18n.ts b/web/src/lib/utils/i18n.tsindex 85331ddf7c..758721c384 100644--- a/web/src/lib/utils/i18n.ts+++ b/web/src/lib/utils/i18n.ts@@ -13,6 +13,14 @@ export const getFormatter = async () => {return get(t);};+const aliases: Record<string, string> = {+ 'zh-CN': 'zh-Hans',+ 'zh-HK': 'zh-Hant',+ 'zh-MO': 'zh-Hant',+ 'zh-SG': 'zh-Hans',+ 'zh-TW': 'zh-Hant',+};+const modules = import.meta.glob('$i18n/*.json');const fileCodes = Object.keys(modules)@@ -33,7 +41,9 @@ const getSubLocales = (locale: string) => {export const getClosestAvailableLocale = (locales: readonly string[], allLocales: readonly string[]) => {const allLocalesSet = new Set(allLocales.map((locale) => convertBCP47(locale)));- return locales.find((locale) => getSubLocales(locale).some((subLocale) => allLocalesSet.has(subLocale)));+ return locales+ .map((locale) => aliases[locale] ?? locale)+ .find((locale) => getSubLocales(locale).some((subLocale) => allLocalesSet.has(subLocale)));};export const getPreferredLocale = () => getClosestAvailableLocale(navigator.languages, langCodes);