Skip to content
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.

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

Change 1 in one key to %{count} #993

Merged
merged 1 commit into from
Nov 16, 2022
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 CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
bo, br, by, cy, dz, ff, ga, gd, guw, gv, ig, ii, iu, jv, kab, kde, kea, ksh,
kw, lag, ln, mo, mt, my, naq, nso, root, sah, se, ses, sg, sh, shi, sma, smi,
smj, smn, sms, ti, to, tzm, wa, yo, zh #1017
- Change instances of the `one` pluralization key to use `%{count}` interpolation #993

## 7.0.5 (2022-07-03)

Expand Down
32 changes: 16 additions & 16 deletions rails/locale/af.yml
Original file line number Diff line number Diff line change
Expand Up @@ -63,41 +63,41 @@ af:
datetime:
distance_in_words:
about_x_hours:
one: ongeveer 1 uur
one: ongeveer %{count} uur
other: ongeveer %{count} ure
about_x_months:
one: ongeveer 1 maand
one: ongeveer %{count} maand
other: ongeveer %{count} maande
about_x_years:
one: ongeveer 1 jaar
one: ongeveer %{count} jaar
other: ongeveer %{count} jaar
almost_x_years:
one: sowat 1 jaar
one: sowat %{count} jaar
other: sowat %{count} jaar
half_a_minute: halfminuut
less_than_x_seconds:
one: minder as 1 sekonde
one: minder as %{count} sekonde
other: minder as %{count} sekondes
less_than_x_minutes:
one: minder as 1 minuut
one: minder as %{count} minuut
other: minder as %{count} minute
over_x_years:
one: meer as 1 jaar
one: meer as %{count} jaar
other: meer as %{count} jaar
x_seconds:
one: 1 sekonde
one: "%{count} sekonde"
other: "%{count} sekondes"
x_minutes:
one: 1 minuut
one: "%{count} minuut"
other: "%{count} minute"
x_days:
one: 1 dag
one: "%{count} dag"
other: "%{count} days"
x_months:
one: 1 maand
one: "%{count} maand"
other: "%{count} maande"
x_years:
one: 1 jaar
one: "%{count} jaar"
other: "%{count} jare"
prompts:
second: Sekondes
Expand Down Expand Up @@ -131,18 +131,18 @@ af:
required: moet bestaan
taken: is reeds geneem
too_long:
one: is te lank (maksimum is 1 karakter)
one: is te lank (maksimum is %{count} karakter)
other: is te lank (maksimum is %{count} karakters)
too_short:
one: is te kort (minimum is 1 karakter)
one: is te kort (minimum is %{count} karakter)
other: is te kort (minimum is %{count} karakters)
wrong_length:
one: is die verkeerde lengte (moet 1 karakter wees)
one: is die verkeerde lengte (moet %{count} karakter wees)
other: is die verkeerde lengte (moet %{count} karakters wees)
template:
body: 'There were problems with the following fields:'
header:
one: 1 fout het verhoed dat hierdie %{model} gestoor kon word
one: "%{count} fout het verhoed dat hierdie %{model} gestoor kon word"
other: "%{count} foute het verhoed dat hierdie %{model} gestoor kon word"
helpers:
select:
Expand Down
24 changes: 12 additions & 12 deletions rails/locale/az.yml
Original file line number Diff line number Diff line change
Expand Up @@ -63,38 +63,38 @@ az:
datetime:
distance_in_words:
about_x_hours:
one: təxminən 1 saat
one: təxminən %{count} saat
other: təxminən %{count} saat
about_x_months:
one: təxminən 1 ay
one: təxminən %{count} ay
other: təxminən %{count} ay
about_x_years:
one: təxminən 1 il
one: təxminən %{count} il
other: təxminən %{count} il
almost_x_years:
one: təqribən 1 il
one: təqribən %{count} il
other: təqribən %{count} il
half_a_minute: yarım dəqiqə
less_than_x_seconds:
one: 1 saniyədən az
one: "%{count} saniyədən az"
other: "%{count} saniyədən az"
less_than_x_minutes:
one: 1 dəqiqədən az
one: "%{count} dəqiqədən az"
other: "%{count} dəqiqədən az"
over_x_years:
one: 1 ildən çox
one: "%{count} ildən çox"
other: "%{count} ildən çox"
x_seconds:
one: 1 saniyə
one: "%{count} saniyə"
other: "%{count} saniyə"
x_minutes:
one: 1 dəqiqə
one: "%{count} dəqiqə"
other: "%{count} dəqiqə"
x_days:
one: 1 gün
one: "%{count} gün"
other: "%{count} gün"
x_months:
one: 1 ay
one: "%{count} ay"
other: "%{count} ay"
prompts:
second: Saniyə
Expand Down Expand Up @@ -133,7 +133,7 @@ az:
template:
body: 'Aşağıdaki səhvlər üzə çıxdı:'
header:
one: "%{model} saxlanmadı: 1 səhv"
one: "%{model} saxlanmadı: %{count} səhv"
other: "%{model} saxlanmadı: %{count} səhv"
helpers:
select:
Expand Down
24 changes: 12 additions & 12 deletions rails/locale/bg.yml
Original file line number Diff line number Diff line change
Expand Up @@ -60,38 +60,38 @@ bg:
datetime:
distance_in_words:
about_x_hours:
one: около 1 час
one: около %{count} час
other: около %{count} часа
about_x_months:
one: около 1 месец
one: около %{count} месец
other: около %{count} месеца
about_x_years:
one: около 1 година
one: около %{count} година
other: около %{count} години
almost_x_years:
one: почти 1 година
one: почти %{count} година
other: почти %{count} години
half_a_minute: половин минута
less_than_x_seconds:
one: по-малко от 1 секунда
one: по-малко от %{count} секунда
other: по-малко от %{count} секунди
less_than_x_minutes:
one: по-малко от 1 минута
one: по-малко от %{count} минута
other: по-малко от %{count} минути
over_x_years:
one: над 1 година
one: над %{count} година
other: над %{count} години
x_seconds:
one: 1 секунда
one: "%{count} секунда"
other: "%{count} секунди"
x_minutes:
one: 1 минута
one: "%{count} минута"
other: "%{count} минути"
x_days:
one: 1 ден
one: "%{count} ден"
other: "%{count} дни"
x_months:
one: 1 месец
one: "%{count} месец"
other: "%{count} месеца"
prompts:
second: Секунда
Expand Down Expand Up @@ -126,7 +126,7 @@ bg:
template:
body: 'Възникнаха проблеми със следните полета:'
header:
one: "%{model}: записът е неуспешен заради 1 грешка"
one: "%{model}: записът е неуспешен заради %{count} грешка"
other: "%{model}: записът е неуспешен заради %{count} грешки"
helpers:
select:
Expand Down
12 changes: 6 additions & 6 deletions rails/locale/bs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ bs:
many: oko %{count} godina
other: oko %{count} godina
almost_x_years:
one: skoro 1 godina
one: skoro %{count} godina
few: skoro %{count} godine
many: skoro %{count} godina
other: skoro %{count} godina
Expand All @@ -99,22 +99,22 @@ bs:
many: preko %{count} godina
other: preko %{count} godina
x_seconds:
one: 1 sekund
one: "%{count} sekund"
few: "%{count} sekunde"
many: "%{count} sekundi"
other: "%{count} sekundi"
x_minutes:
one: 1 minut
one: "%{count} minut"
few: "%{count} minute"
many: "%{count} minuta"
other: "%{count} minuta"
x_days:
one: 1 dan
one: "%{count} dan"
few: "%{count} dana"
many: "%{count} dana"
other: "%{count} dana"
x_months:
one: 1 mjesec
one: "%{count} mjesec"
few: "%{count} mjeseca"
many: "%{count} mjeseci"
other: "%{count} mjeseci"
Expand Down Expand Up @@ -153,7 +153,7 @@ bs:
template:
body: 'Desili su se problemi sa sljedećim poljima:'
header:
one: 1 greška je spriječila da se ovaj %{model} spremi
one: "%{count} greška je spriječila da se ovaj %{model} spremi"
few: "%{count} greške su spriječile da se ovaj %{model} spremi"
many: "%{count} grešaka je spriječilo da se ovaj %{model} spremi"
other: "%{count} grešaka je spriječilo da se ovaj %{model} spremi"
Expand Down
34 changes: 17 additions & 17 deletions rails/locale/ca.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ ca:
record_invalid: 'La validació ha fallat: %{errors}'
restrict_dependent_destroy:
has_one: No es pot eliminar el registre perquè existeix un %{record} dependent
has_many: No es pot eliminar el registre perquè existeixen %{record} dependents
has_many: No es pot eliminar el registre perquè existeixen %{record} dependents
date:
abbr_day_names:
- Dg
Expand Down Expand Up @@ -63,41 +63,41 @@ ca:
datetime:
distance_in_words:
about_x_hours:
one: aproximadament 1 hora
one: aproximadament %{count} hora
other: aproximadament %{count} hores
about_x_months:
one: aproximadament 1 mes
one: aproximadament %{count} mes
other: aproximadament %{count} mesos
about_x_years:
one: aproximadament 1 any
one: aproximadament %{count} any
other: aproximadament %{count} anys
almost_x_years:
one: quasi 1 any
one: quasi %{count} any
other: quasi %{count} anys
half_a_minute: mig minut
less_than_x_seconds:
one: menys d'1 segon
one: menys d'%{count} segon
other: menys de %{count} segons
less_than_x_minutes:
one: menys d'1 minut
one: menys d'%{count} minut
other: menys de %{count} minuts
over_x_years:
one: més d'1 any
one: més d'%{count} any
other: més de %{count} anys
x_seconds:
one: 1 segon
one: "%{count} segon"
other: "%{count} segons"
x_minutes:
one: 1 minut
one: "%{count} minut"
other: "%{count} minuts"
x_days:
one: 1 dia
one: "%{count} dia"
other: "%{count} dies"
x_months:
one: 1 mes
one: "%{count} mes"
other: "%{count} mesos"
x_years:
one: 1 year
one: "%{count} year"
other: "%{count} years"
prompts:
second: segon
Expand Down Expand Up @@ -131,18 +131,18 @@ ca:
required: ha d'existir
taken: no està disponible
too_long:
one: és massa llarg (1 caràcter màxim)
one: és massa llarg (%{count} caràcter màxim)
other: és massa llarg (%{count} caràcters màxim)
too_short:
one: és massa curt (1 caràcter mínim)
one: és massa curt (%{count} caràcter mínim)
other: és massa curt (%{count} caràcters mínim)
wrong_length:
one: no té la longitud correcta (1 caràcter exactament)
one: no té la longitud correcta (%{count} caràcter exactament)
other: no té la longitud correcta (%{count} caràcters exactament)
template:
body: 'Hi ha hagut problemes amb els següents camps:'
header:
one: No s'ha pogut desar aquest/a %{model} perquè hi ha 1 error
one: No s'ha pogut desar aquest/a %{model} perquè hi ha %{count} error
other: No s'ha pogut desar aquest/a %{model} perquè hi ha hagut %{count} errors
helpers:
select:
Expand Down
6 changes: 3 additions & 3 deletions rails/locale/da.yml
Original file line number Diff line number Diff line change
Expand Up @@ -131,13 +131,13 @@ da:
required: skal udfyldes
taken: er allerede brugt
too_long:
one: er for lang (højst 1 tegn)
one: er for lang (højst %{count} tegn)
other: er for lang (højst %{count} tegn)
too_short:
one: er for kort (mindst 1 tegn)
one: er for kort (mindst %{count} tegn)
other: er for kort (mindst %{count} tegn)
wrong_length:
one: har forkert længde (skulle være 1 tegn)
one: har forkert længde (skulle være %{count} tegn)
other: har forkert længde (skulle være %{count} tegn)
template:
body: 'Der var problemer med følgende felter:'
Expand Down
6 changes: 3 additions & 3 deletions rails/locale/de-AT.yml
Original file line number Diff line number Diff line change
Expand Up @@ -129,13 +129,13 @@ de-AT:
required: muss ausgefüllt werden
taken: ist bereits vergeben
too_long:
one: ist zu lang (mehr als 1 Zeichen)
one: ist zu lang (mehr als %{count} Zeichen)
other: ist zu lang (mehr als %{count} Zeichen)
too_short:
one: ist zu kurz (weniger als 1 Zeichen)
one: ist zu kurz (weniger als %{count} Zeichen)
other: ist zu kurz (weniger als %{count} Zeichen)
wrong_length:
one: hat die falsche Länge (muss genau 1 Zeichen haben)
one: hat die falsche Länge (muss genau %{count} Zeichen haben)
other: hat die falsche Länge (muss genau %{count} Zeichen haben)
template:
body: 'Bitte überprüfen Sie die folgenden Felder:'
Expand Down
6 changes: 3 additions & 3 deletions rails/locale/de-CH.yml
Original file line number Diff line number Diff line change
Expand Up @@ -129,13 +129,13 @@ de-CH:
required: muss ausgefüllt werden
taken: ist bereits vergeben
too_long:
one: ist zu lang (mehr als 1 Zeichen)
one: ist zu lang (mehr als %{count} Zeichen)
other: ist zu lang (mehr als %{count} Zeichen)
too_short:
one: ist zu kurz (weniger als 1 Zeichen)
one: ist zu kurz (weniger als %{count} Zeichen)
other: ist zu kurz (weniger als %{count} Zeichen)
wrong_length:
one: hat die falsche Länge (muss genau 1 Zeichen haben)
one: hat die falsche Länge (muss genau %{count} Zeichen haben)
other: hat die falsche Länge (muss genau %{count} Zeichen haben)
template:
body: 'Bitte überprüfen Sie die folgenden Felder:'
Expand Down
Loading