Fix browser language detection for region specific languages (#8982) (#9026)

This commit is contained in:
rmogstad 2021-04-29 16:11:03 -07:00 committed by GitHub
parent a288fd370f
commit a28616d535
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -36,9 +36,18 @@ export function findAvailableLanguage(language: string) {
return LOCALE_LOOKUP[langLower]; return LOCALE_LOOKUP[langLower];
} }
return Object.keys(translationMetadata.translations).find( const translation = Object.keys(translationMetadata.translations).find(
(lang) => lang.toLowerCase() === langLower (lang) => lang.toLowerCase() === langLower
); );
if (translation) {
return translation;
}
if (language.includes("-")) {
return findAvailableLanguage(language.split("-")[0]);
}
return undefined;
} }
/** /**
@ -94,13 +103,6 @@ export function getLocalLanguage() {
if (language) { if (language) {
return language; return language;
} }
if (navigator.language && navigator.language.includes("-")) {
language = findAvailableLanguage(navigator.language.split("-")[0]);
if (language) {
return language;
}
}
// Final fallback // Final fallback
return "en"; return "en";
} }