Merge pull request #956 from matrix-org/t3chguy/i18n_electron
fix i18n in a situation where navigator.languages=[]
This commit is contained in:
@@ -87,10 +87,10 @@ export function getAllLanguageKeysFromJson() {
|
||||
}
|
||||
|
||||
export function getLanguagesFromBrowser() {
|
||||
if (navigator.languages) return navigator.languages;
|
||||
if (navigator.language) return [navigator.language]
|
||||
if (navigator.languages && navigator.languages.length) return navigator.languages;
|
||||
if (navigator.language) return [navigator.language];
|
||||
return [navigator.userLanguage];
|
||||
};
|
||||
}
|
||||
|
||||
/**
|
||||
* Turns a language string, normalises it,
|
||||
|
||||
Reference in New Issue
Block a user