Skip to content

Commit d612fb5

Browse files
committed
frontend: defaults to en for lang selector
The commit fixes a bug where the selected default language fell back to Arabic instead of English when the system's language wasn't supported.
1 parent 5f823b4 commit d612fb5

File tree

2 files changed

+8
-6
lines changed

2 files changed

+8
-6
lines changed

frontends/web/src/components/language/language.test.tsx

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,11 @@ vi.mock('react-i18next', () => ({
2727

2828
describe('components/language/language', () => {
2929
const supportedLangs = [
30-
{ code: 'en-US', display: 'English' },
31-
{ code: 'pt', display: 'Portugues' },
32-
{ code: 'ms', display: 'Bahasa Melayu' },
30+
{ code: 'ar', display: 'Arabic' },
3331
{ code: 'de', display: 'Deutsch' },
32+
{ code: 'en', display: 'English' },
33+
{ code: 'ms', display: 'Bahasa Melayu' },
34+
{ code: 'pt', display: 'Portugues' },
3435
] as TLanguagesList;
3536

3637
/**
@@ -81,7 +82,7 @@ describe('components/language/language', () => {
8182
},
8283
});
8384
const { getByTestId } = renderSwitchAndOpenDialog();
84-
const defaultLang = getByTestId('language-selection-en-US');
85+
const defaultLang = getByTestId('language-selection-en');
8586
expect(defaultLang.getAttribute('class')).toContain('selected');
8687
});
8788
});

frontends/web/src/utils/language.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,10 @@ export const getSelectedIndex = (languages: TLanguagesList, i18n: Ii18n) => {
1919
index = languages.findIndex(({ code }) => code === tag);
2020
}
2121

22-
// Give up. We tried.
22+
// Default fallback to English
23+
// or the first index if English isn't defined
2324
if (index === -1) {
24-
return 0;
25+
return languages.findIndex(({ code }) => code === 'en') || 0;
2526
}
2627

2728
return index;

0 commit comments

Comments
 (0)