From a28616d535c5824150d95753d1d22e9aeceba821 Mon Sep 17 00:00:00 2001 From: rmogstad Date: Thu, 29 Apr 2021 16:11:03 -0700 Subject: [PATCH] Fix browser language detection for region specific languages (#8982) (#9026) --- src/util/hass-translation.ts | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/src/util/hass-translation.ts b/src/util/hass-translation.ts index 694af2ee4e..a203ec894e 100644 --- a/src/util/hass-translation.ts +++ b/src/util/hass-translation.ts @@ -36,9 +36,18 @@ export function findAvailableLanguage(language: string) { return LOCALE_LOOKUP[langLower]; } - return Object.keys(translationMetadata.translations).find( + const translation = Object.keys(translationMetadata.translations).find( (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) { return language; } - if (navigator.language && navigator.language.includes("-")) { - language = findAvailableLanguage(navigator.language.split("-")[0]); - if (language) { - return language; - } - } - // Final fallback return "en"; }