Skip to content

fix: label Chinese languages by script in the language picker #2072

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
claude wants to merge 1 commit into
base: main
Choose a base branch
from
+14 −3
Open

fix: label Chinese languages by script in the language picker #2072

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 8 additions & 1 deletion packages/app/src/renderer/features/settings/SettingsPage.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,14 @@ describe('General settings', () => {
fireEvent.click(screen.getByRole('button', { name: /^(?!reset).*locale\.title/ }));
const names = screen.getAllByRole('option').map((option) => option.textContent);
expect(names).toEqual(
expect.arrayContaining(['locale.system', 'English', 'Deutsch', '日本語']),
expect.arrayContaining([
'locale.system',
'English',
'Deutsch',
'日本語',
'简体中文',
'繁體中文',
]),
);
expect(names.some((name) => /Pseudo|XA|XB/.test(name ?? ''))).toBe(false);
});
Expand Down
8 changes: 6 additions & 2 deletions packages/app/src/renderer/features/settings/SettingsPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,11 +215,15 @@ export function SettingsPage() {
);
}

/** Chinese is named by script, not region: 简体中文 and 繁體中文. */
const DISPLAY_TAGS: Record<string, string> = { 'zh-CN': 'zh-Hans', 'zh-TW': 'zh-Hant' };

/** A language by its own name, so it can be found from any UI language. A tag that isn't well formed (a hand-edited settings.json can hold one) shows as it is. */
function languageName(code: string): string {
try {
const name = new Intl.DisplayNames([code], { type: 'language' }).of(code) ?? code;
return name.charAt(0).toLocaleUpperCase(code) + name.slice(1);
const tag = DISPLAY_TAGS[code] ?? code;
const name = new Intl.DisplayNames([tag], { type: 'language' }).of(tag) ?? code;
return name.charAt(0).toLocaleUpperCase(tag) + name.slice(1);
} catch {
return code;
}
Expand Down
Loading