mirrors/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2024-11-23 13:05:12 +01:00
Code Issues Projects Releases Wiki Activity

Fix 0 pluralization for some localization strings (#17576)

Browse Source 
Apparently, when the `zero` case is not defined, the translation string used
for `0` depends on the language. In French, `one` is used, causing some strings
with hardcoded “one” or `1` to misrepresent the actual data.

For instance, the dashboard would display « 1 utilisateur·rice en attente » for
both 0 and 1 pending users.
This commit is contained in:
Claire 2022-02-16 14:57:57 +01:00 committed by GitHub
parent 6ea80ba2a2
commit 1abf0f9000
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
config/locales/en.yml
View File

@ -394,16 +394,16 @@ en:
new_users: new users new_users: new users
opened_reports: reports opened opened_reports: reports opened
pending_appeals_html: pending_appeals_html:
one: "<strong>1</strong> pending appeal" one: "<strong>%{count}</strong> pending appeal"
other: "<strong>%{count}</strong> pending appeals" other: "<strong>%{count}</strong> pending appeals"
pending_reports_html: pending_reports_html:
one: "<strong>1</strong> pending report" one: "<strong>%{count}</strong> pending report"
other: "<strong>%{count}</strong> pending reports" other: "<strong>%{count}</strong> pending reports"
pending_tags_html: pending_tags_html:
one: "<strong>1</strong> pending hashtag" one: "<strong>%{count}</strong> pending hashtag"
other: "<strong>%{count}</strong> pending hashtags" other: "<strong>%{count}</strong> pending hashtags"
pending_users_html: pending_users_html:
one: "<strong>1</strong> pending user" one: "<strong>%{count}</strong> pending user"
other: "<strong>%{count}</strong> pending users" other: "<strong>%{count}</strong> pending users"
resolved_reports: reports resolved resolved_reports: reports resolved
software: Software software: Software
@ -457,6 +457,7 @@ en:
affected_accounts: affected_accounts:
one: One account in the database affected one: One account in the database affected
other: "%{count} accounts in the database affected" other: "%{count} accounts in the database affected"
zero: No account in the database is affected
retroactive: retroactive:
silence: Undo limit of existing affected accounts from this domain silence: Undo limit of existing affected accounts from this domain
suspend: Unsuspend existing affected accounts from this domain suspend: Unsuspend existing affected accounts from this domain
@ -510,6 +511,7 @@ en:
known_accounts: known_accounts:
one: "%{count} known account" one: "%{count} known account"
other: "%{count} known accounts" other: "%{count} known accounts"
zero: No known account
moderation: moderation:
all: All all: All
limited: Limited limited: Limited
@ -769,6 +771,7 @@ en:
shared_by_over_week: shared_by_over_week:
one: Shared by one person over the last week one: Shared by one person over the last week
other: Shared by %{count} people over the last week other: Shared by %{count} people over the last week
zero: Shared by noone over the last week
title: Trending links title: Trending links
usage_comparison: Shared %{today} times today, compared to %{yesterday} yesterday usage_comparison: Shared %{today} times today, compared to %{yesterday} yesterday
pending_review: Pending review pending_review: Pending review
@ -798,6 +801,7 @@ en:
used_by_over_week: used_by_over_week:
one: Used by one person over the last week one: Used by one person over the last week
other: Used by %{count} people over the last week other: Used by %{count} people over the last week
zero: Used by noone over the last week
title: Trends title: Trends
warning_presets: warning_presets:
add_new: Add new add_new: Add new