Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions ui/desktop/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@
"i18n:extract": "formatjs extract 'src/**/*.{ts,tsx}' --ignore '**/*.d.ts' --out-file src/i18n/messages/en.json --flatten && pnpm run i18n:compile",
"i18n:check": "node scripts/i18n-check.js && node scripts/i18n-validate-locale.js",
"i18n:compile": "node scripts/i18n-compile.js",
"i18n:validate-es": "node scripts/i18n-validate-locale.js es",
"i18n:validate-ja": "node scripts/i18n-validate-locale.js ja",
"i18n:validate-locale": "node scripts/i18n-validate-locale.js"
},
Expand Down
2 changes: 2 additions & 0 deletions ui/desktop/src/components/settings/app/AppSettingsSection.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@ const i18n = defineMessages({
languageTurkish: { id: 'settings.language.turkish', defaultMessage: 'Turkish' },
languageHindi: { id: 'settings.language.hindi', defaultMessage: 'Hindi' },
languageJapanese: { id: 'settings.language.japanese', defaultMessage: 'Japanese' },
languageSpanish: { id: 'settings.language.spanish', defaultMessage: 'Spanish' },
helpTitle: { id: 'settings.help.title', defaultMessage: 'Help & feedback' },
helpDesc: {
id: 'settings.help.description',
Expand Down Expand Up @@ -144,6 +145,7 @@ const i18n = defineMessages({
const LANGUAGE_OPTIONS: Array<{ value: LanguageSetting; message: keyof typeof i18n }> = [
{ value: 'system', message: 'languageSystem' },
{ value: 'en', message: 'languageEnglish' },
{ value: 'es', message: 'languageSpanish' },
{ value: 'hi', message: 'languageHindi' },
{ value: 'ja', message: 'languageJapanese' },
{ value: 'ru', message: 'languageRussian' },
Expand Down
12 changes: 11 additions & 1 deletion ui/desktop/src/i18n/i18n.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,6 @@ describe('getLocale', () => {
expect(getLocale()).toEqual({ locale: 'tr', messageLocale: 'tr' });
});


it('supports Japanese from navigator.languages', () => {
vi.stubGlobal('navigator', { languages: ['ja-JP'] });
expect(getLocale()).toEqual({ locale: 'ja-JP', messageLocale: 'ja' });
Expand All @@ -96,6 +95,17 @@ describe('getLocale', () => {
expect(getLocale()).toEqual({ locale: 'hi', messageLocale: 'hi' });
});

it('supports Spanish from navigator.languages', () => {
vi.stubGlobal('navigator', { languages: ['es-ES'] });
expect(getLocale()).toEqual({ locale: 'es-ES', messageLocale: 'es' });
});

it('supports explicit Spanish locale', () => {
mockAppConfig({ GOOSE_LOCALE: 'es' });
vi.stubGlobal('navigator', { languages: ['xx-XX'] });
expect(getLocale()).toEqual({ locale: 'es', messageLocale: 'es' });
});

it('falls back to base language when locale tag is invalid BCP 47', () => {
// "en-" is not a valid BCP 47 tag and would cause RangeError in Intl APIs
mockAppConfig({ GOOSE_LOCALE: 'en-' });
Expand Down
2 changes: 1 addition & 1 deletion ui/desktop/src/i18n/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
export { defineMessages, useIntl } from 'react-intl';

/** The set of locales that have translation catalogs. */
export const SUPPORTED_LOCALES = ['en', 'hi', 'ja', 'ru', 'tr', 'zh-CN'] as const;
export const SUPPORTED_LOCALES = ['en', 'es', 'hi', 'ja', 'ru', 'tr', 'zh-CN'] as const;

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P2 Badge Add Spanish to the app language settings

Adding es here makes Spanish a supported message catalog, but the settings path still cannot select or persist it: LanguageSetting, validLanguageSettings, and LANGUAGE_OPTIONS only enumerate en, hi, ja, ru, tr, and zh-CN. In the settings UI this means users cannot choose Spanish, and any attempted language: "es" update is rejected by the main-process whitelist instead of being saved.

Useful? React with 👍 / 👎.

export type SupportedLocale = (typeof SUPPORTED_LOCALES)[number];
const SUPPORTED_LOCALE_SET = new Set<string>(SUPPORTED_LOCALES);

Expand Down
3 changes: 3 additions & 0 deletions ui/desktop/src/i18n/messages/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -4100,6 +4100,9 @@
"settings.language.russian": {
"defaultMessage": "Russian"
},
"settings.language.spanish": {
"defaultMessage": "Spanish"
},
"settings.language.systemDefault": {
"defaultMessage": "System Default"
},
Expand Down
Loading
Loading