rails-i18n 7.0.6 → 7.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 475615df0336d9f48d08c06d2037b0661d80f74c4330d0a55bf67271a4658550
-  data.tar.gz: c46313e99ee432b4f5873a9464af037a23e3b8009f09e7c60e57b9fb7033590f
+  metadata.gz: 4b6b63235eb4a6a2008be34a7fc2f9d68c982bdc149cc1584b07be4a47df32e3
+  data.tar.gz: 3233aea32115ecdd2a32b70d869a156f07623d4c1bb754ea05de0f8ea44d7ccb
 SHA512:
-  metadata.gz: 7fd3393b9d32f9b2986a02350d4b42a374a927fe1e173bb1c3cf821175ca1ff091298a4406105111624336942f769102e95561ad9b635fd460f05260c9283951
-  data.tar.gz: 14d018acae0d21299050e7f06e39a9c10173682062d268e1a90e8726cf7478e336ae28dcbbde09e12753f7f8b76398e13cdbe589312e072468dfe8c159579926
+  metadata.gz: e28e003e6f7c797f8d4885ea8aa6edf15ff6c7b0be06ff7f18ed351dae7ccc54782bf4f6cc7879e9b8c8dbeac6db21c61523d88c8ec1dd4c9e927d2cb3e7ab00
+  data.tar.gz: ef5f52b3d499b64449e099ed65d97b9638dc31f3027dc461234252485695728a9d1d0766624db2104b5a84007d95d8e21b4e9d3b9b285f4cf7fbf3f27a5859a8

data/CHANGELOG.md

@@ -1,3 +1,23 @@
+## 7.0.7 (2022-05-12)
+
+- Non-numerics counts are considered as `other` in all pluralizations #1067
+- Update following locales:
+  - Afrikaan (af): ZAR currency format #1066
+  - English (en-ZA): ZAR currency format #1066
+  - German (de, de-DE, de-AT, de-CH): Use abbreviated months in the short time format #1062
+  - Japanese (ja): Add `in` and `round_mode` keys #1059
+  - Korean (ko): Fix typo in `equal_to` keys #1061
+  - Portuguese (pt, pt-BR): add translation for `errors.messages.in` #1071
+  - Scottish Gaelic (gd): Add locale
+  - Russian (ru): fix some errors in 'datetime' section, add `errors.messages.in` and `number.format.round_mode` keys #1077
+  - Spanish (es): add translation for `errors.messages.in` #1071
+  - French (fr, fr-CA, fr-CH, fr-FR): fix typo on 'almost_x_years: one' #1074
+  - Indonesian (id): Remove duplicate spaces in `id.datetime.distance_in_words.less_than_x_minutes.other` #1079
+  - Romanian (ro): Correction of Saturday in Romanian #1078
+  - Croatian (hr): use lowercase for month and weekday names #1081
+- Add ordinalization for German (de, de-AT, de-CH, de-DE)
+- Remove keys that are present twice from Latvian (lv), Albanian (sq) #1080
+
 ## 7.0.6 (2022-11-08)
 
 - Add option to choose which modules (locales, pluralization, transliteration,
@@ -38,6 +58,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)
 

data/lib/rails_i18n/common_pluralizations/east_slavic.rb

@@ -6,7 +6,6 @@
 module RailsI18n
   module Pluralization
     module EastSlavic
-
       FROM_2_TO_4   = (2..4).to_a.freeze
       FROM_5_TO_9   = (5..9).to_a.freeze
       FROM_11_TO_14 = (11..14).to_a.freeze
@@ -14,7 +13,8 @@ module RailsI18n
 
       def self.rule
         lambda do |n|
-          n ||= 0
+          return :other unless n.is_a?(Numeric)
+
           mod10 = n % 10
           mod100 = n % 100
 

data/lib/rails_i18n/common_pluralizations/one_few_other.rb

@@ -6,7 +6,8 @@ module RailsI18n
 
       def self.rule
         lambda do |n|
-          n ||= 0
+          return :other unless n.is_a?(Numeric)
+
           frac = (n.to_d % 1)
 
           if frac.nonzero?

data/lib/rails_i18n/common_pluralizations/one_other.rb

@@ -16,4 +16,4 @@ module RailsI18n
       end
     end
   end
-end
+end

data/lib/rails_i18n/common_pluralizations/one_two_other.rb

@@ -6,12 +6,10 @@ module RailsI18n
     module OneTwoOther
       def self.rule
         lambda do |n|
-          if n == 1
-            :one
-          elsif n == 2
-            :two
-          else
-            :other
+          case n
+          when 1 then :one
+          when 2 then :two
+          else :other
           end
         end
       end
@@ -25,4 +23,4 @@ module RailsI18n
       end
     end
   end
-end
+end

data/lib/rails_i18n/common_pluralizations/one_upto_two_other.rb

@@ -4,7 +4,9 @@ module RailsI18n
   module Pluralization
     module OneUptoTwoOther
       def self.rule
-        lambda { |n| n && n >= 0 && n < 2 ? :one : :other }
+        lambda do |n|
+          n.is_a?(Numeric) && n >= 0 && n < 2 ? :one : :other
+        end
       end
 
       def self.with_locale(locale)
@@ -16,4 +18,4 @@ module RailsI18n
       end
     end
   end
-end
+end

data/lib/rails_i18n/common_pluralizations/one_with_zero_other.rb

@@ -5,7 +5,12 @@ module RailsI18n
   module Pluralization
     module OneWithZeroOther
       def self.rule
-        lambda { |n| n == 0 || n == 1 ? :one : :other }
+        lambda do |n|
+          case n
+          when 0, 1 then :one
+          else :other
+          end
+        end
       end
 
       def self.with_locale(locale)

data/lib/rails_i18n/common_pluralizations/romanian.rb

@@ -3,12 +3,15 @@
 module RailsI18n
   module Pluralization
     module Romanian
+      FROM_1_TO_19 = (1..19).to_a.freeze
+
       def self.rule
         lambda do |n|
-          n ||= 0
+          return :other unless n.is_a?(Numeric)
+
           if n == 1
             :one
-          elsif n == 0 || (1..19).to_a.include?(n % 100)
+          elsif n == 0 || FROM_1_TO_19.include?(n % 100)
             :few
           else
             :other

data/lib/rails_i18n/common_pluralizations/west_slavic.rb

@@ -5,12 +5,10 @@ module RailsI18n
     module WestSlavic
       def self.rule
         lambda do |n|
-          if n == 1
-            :one
-          elsif [2, 3, 4].include?(n)
-            :few
-          else
-            :other
+          case n
+          when 1 then :one
+          when 2, 3, 4 then :few
+          else :other
           end
         end
       end

data/rails/locale/af.yml

@@ -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
@@ -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:
@@ -154,10 +154,10 @@ af:
   number:
     currency:
       format:
-        delimiter: ","
-        format: "%u%n"
+        delimiter: " "
+        format: "%u %n"
         precision: 2
-        separator: "."
+        separator: ","
         significant: false
         strip_insignificant_zeros: false
         unit: R

data/rails/locale/az.yml

@@ -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ə
@@ -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:

data/rails/locale/bg.yml

@@ -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: Секунда
@@ -126,7 +126,7 @@ bg:
     template:
       body: 'Възникнаха проблеми със следните полета:'
       header:
-        one: "%{model}: записът е неуспешен заради 1 грешка"
+        one: "%{model}: записът е неуспешен заради %{count} грешка"
         other: "%{model}: записът е неуспешен заради %{count} грешки"
   helpers:
     select:

data/rails/locale/bs.yml

@@ -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
@@ -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"
@@ -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"

data/rails/locale/ca.yml

@@ -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
@@ -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
@@ -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: