Skip to content

Commit 8cbefb1

Browse files
committed
i18n: refactor browserLanguagesToLang to use navigator.languages directly
1 parent c0cf1de commit 8cbefb1

4 files changed

Lines changed: 5 additions & 6 deletions

File tree

resources/languages.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -89,8 +89,7 @@ export const langToLocale = (lang: Lang): string => {
8989
}[lang];
9090
};
9191

92-
export const browserLanguagesToLang = (languagesArr: readonly string[]): Lang => {
93-
// languagesArr receives only `navigator.languages` as input
92+
export const browserLanguagesToLang = (): Lang => {
9493
const mapLanguage = (lang: string): string => {
9594
// Handle Chinese variants
9695
if (lang.startsWith('zh-')) {
@@ -107,7 +106,7 @@ export const browserLanguagesToLang = (languagesArr: readonly string[]): Lang =>
107106
}
108107
return lang.slice(0, 2);
109108
};
110-
const lang = [...languagesArr, 'en']
109+
const lang = [...navigator.languages, 'en']
111110
.map(mapLanguage)
112111
.filter((l) => languages.includes(l as Lang))[0];
113112
return isLang(lang) ? lang : 'en';

ui/raidboss/raidemulator.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ const raidEmulatorOnLoad = async () => {
151151

152152
if (!websocketConnected) {
153153
// Find the most appropriate lang code to use based on browser language priority
154-
const browserLang = browserLanguagesToLang(navigator.languages);
154+
const browserLang = browserLanguagesToLang();
155155
applyTranslation(browserLang);
156156

157157
options.ParserLanguage = browserLang;

util/coverage/coverage.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1363,7 +1363,7 @@ const buildLanguageSelect = (container: HTMLElement, lang: Lang) => {
13631363
document.addEventListener('DOMContentLoaded', () => {
13641364
// Allow for `coverage.html?lang=de` style constructions.
13651365
const params = new URLSearchParams(window.location.search);
1366-
const langStr = params.get('lang') ?? browserLanguagesToLang(navigator.languages);
1366+
const langStr = params.get('lang') ?? browserLanguagesToLang();
13671367
// TODO: left for now as backwards compatibility with user css. Remove this later??
13681368
document.body.classList.add(`lang-${langStr}`);
13691369
const lang = langStr !== null && isLang(langStr) ? langStr : 'en';

util/logtools/web_splitter.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -349,7 +349,7 @@ const downloadFile = (output: string[], filename: string): void => {
349349
};
350350

351351
const onLoaded = () => {
352-
const lang = browserLanguagesToLang(navigator.languages);
352+
const lang = browserLanguagesToLang();
353353

354354
const table = getElement('fight-table');
355355
const fileDrop = getElement('filedrop');

0 commit comments

Comments
 (0)