dearsky/ntfy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix web app i18n issue in account preferences

Browse Source
This commit is contained in:
binwiederhier
2023-05-15 19:49:34 -04:00
parent ed0c1abd2f
commit f998d4d2ad
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
web/src/components/Account.js
View File

@@ -390,7 +390,7 @@ const Stats = () => {
description={t("account_usage_attachment_storage_description", {
filesize: formatBytes(account.limits.attachment_file_size),
expiry: humanizeDuration(account.limits.attachment_expiry_duration * 1000, {
language: i18n.language,
language: i18n.resolvedLanguage,
fallbacks: ["en"]
})
})}

2
web/src/components/Preferences.js
View File

@@ -436,7 +436,7 @@ const Appearance = () => {
const Language = () => {
const { t, i18n } = useTranslation();
const labelId = "prefLanguage";
const lang = i18n.language ?? "en";
const lang = i18n.resolvedLanguage ?? "en";
// Country flags are displayed using emoji. Emoji rendering is handled by platform fonts.
// Windows in particular does not yet play nicely with flag emoji so for now, hide flags on Windows.