Skip to content

Make actions_font_family_no_default and content_font_family_no_default more translation-friendly #3880

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

Merged
merged 2 commits into from
Nov 1, 2024
Merged

Make actions_font_family_no_default and content_font_family_no_default more translation-friendly #3880

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9e6755b
Make actions_font_family_no_default and content_font_family_no_defaul…
jjanuszkiewicz Jul 25, 2024
5cc01bc
Use new i18n keys
jjanuszkiewicz Jul 27, 2024
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
4 changes: 2 additions & 2 deletions public/locales/en/translation.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"accessibility": {
"actions_font_family_no_default": "Actions Font Family (Default):",
"actions_font_family_default": "Actions Font Family (Default: {{fontFamily}})",
"all_tiles_in_color": "Show all game tiles in color",
"content_font_family_no_default": "Content Font Family (Default: ",
"content_font_family_default": "Content Font Family (Default: {{fontFamily}})",
"disable_dialog_backdrop_close": "Disable closing dialogs by clicking outside",
"fonts": "Fonts",
"title": "Accessibility",
Expand Down
26 changes: 10 additions & 16 deletions src/frontend/screens/Accessibility/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,14 +163,11 @@ export default React.memo(function Accessibility() {
htmlId="content-font-family"
value={contentFont}
onChange={handleContentFontFamily}
label={
t(
'accessibility.content_font_family_no_default',
'Content Font Family (Default: '
) +
defaultSecondaryFont.split(',')[0].trim() +
')'
}
label={t(
'accessibility.content_font_family_default',
'Content Font Family (Default: {{fontFamily}})',
{ fontFamily: defaultSecondaryFont.split(',')[0].trim() }
)}
>
{options}
</SelectField>
Expand All @@ -179,14 +176,11 @@ export default React.memo(function Accessibility() {
htmlId="actions-font-family"
value={actionFont}
onChange={handleActionsFontFamily}
label={
t(
'accessibility.actions_font_family_no_default',
'Actions Font Family (Default: '
) +
defaultPrimaryFont.split(',')[0].trim() +
')'
}
label={t(
'accessibility.actions_font_family_default',
'Actions Font Family (Default: {{fontFamily}})',
{ fontFamily: defaultPrimaryFont.split(',')[0].trim() }
)}
>
{options}
</SelectField>
Expand Down
Loading