i18n 1.11.0 → 1.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fec00bc17a2d4f9845a6bf1394deefaab31a14460c440d5012db8939d4de2d19
-  data.tar.gz: d5b2c057789154f3db274d6c0612dec850c2af96127c37204ac81308636ca841
+  metadata.gz: b92d195deaeca5e93f73cc62be2d2fb4c93d8a9787449e168b493773e5072458
+  data.tar.gz: f1172c9fac93f493c8a5b16cff4b27154ff917aed48cbc46a4a702363863111d
 SHA512:
-  metadata.gz: 468a6a2336896a0f5185350c16a49929e27b2201efe92bc5d067a7a03787bfa814bbe2de838be78205d870961e023633d8dbd494f488b1a6d77773082ed442de
-  data.tar.gz: d6fb232b7a711de31cbc3ce93a624a858684c3f8258eb558774b36da2aa2a0ba9baa6bf6c65901cbdfc06f44b6810c383e6c0dd47eb1569c4ddb07394332f81d
+  metadata.gz: 0174d10f7bac17e29cf7622d3ce69850e51755d53fd3d17d2f672bc9ca3c75823b851f6d04cbd367fea8ff5830c8c755fb9c80433bac9ec3c46590cbe9a874d0
+  data.tar.gz: ef22ed98cb7f223753a65b9d63d0f40e4b6821c93a41b1b41627e4c7b4e3de6b7bd411d8a6ed3d46dc6554432a776535c0461248e8d1fbfeee05dcda2ab89235

data/lib/i18n/backend/pluralization.rb

@@ -16,51 +16,26 @@ module I18n
     module Pluralization
       # Overwrites the Base backend translate method so that it will check the
       # translation meta data space (:i18n) for a locale specific pluralization
-      # rule and use it to pluralize the given entry. I.e., the library expects
+      # rule and use it to pluralize the given entry. I.e. the library expects
       # pluralization rules to be stored at I18n.t(:'i18n.plural.rule')
       #
       # Pluralization rules are expected to respond to #call(count) and
-      # return a pluralization key. Valid keys depend on the pluralization
-      # rules for the locale, as defined in the CLDR.
-      # As of v41, 6 locale-specific plural categories are defined:
-      #   :few, :many, :one, :other, :two, :zero
+      # return a pluralization key. Valid keys depend on the translation data
+      # hash (entry) but it is generally recommended to follow CLDR's style,
+      # i.e., return one of the keys :zero, :one, :few, :many, :other.
       #
-      # n.b., The :one plural category does not imply the number 1.
-      # Instead, :one is a category for any number that behaves like 1 in
-      # that locale. For example, in some locales, :one is used for numbers
-      # that end in "1" (like 1, 21, 151) but that don't end in
-      # 11 (like 11, 111, 10311).
-      # Similar notes apply to the :two, and :zero plural categories.
-      #
-      # If you want to have different strings for the categories of count == 0
-      # (e.g. "I don't have any cars") or count == 1 (e.g. "I have a single car")
-      # use the explicit `"0"` and `"1"` keys.
-      # https://unicode-org.github.io/cldr/ldml/tr35-numbers.html#Explicit_0_1_rules
+      # The :zero key is always picked directly when count equals 0 AND the
+      # translation data has the key :zero. This way translators are free to
+      # either pick a special :zero translation even for languages where the
+      # pluralizer does not return a :zero key.
       def pluralize(locale, entry, count)
         return entry unless entry.is_a?(Hash) && count
 
         pluralizer = pluralizer(locale)
         if pluralizer.respond_to?(:call)
-          # "0" and "1" are special cases
-          # https://unicode-org.github.io/cldr/ldml/tr35-numbers.html#Explicit_0_1_rules
-          if count == 0 || count == 1
-            value = entry[symbolic_count(count)]
-            return value if value
-          end
-
-          # Lateral Inheritance of "count" attribute (http://www.unicode.org/reports/tr35/#Lateral_Inheritance):
-          # > If there is no value for a path, and that path has a [@count="x"] attribute and value, then:
-          # > 1. If "x" is numeric, the path falls back to the path with [@count=«the plural rules category for x for that locale»], within that the same locale.
-          # > 2. If "x" is anything but "other", it falls back to a path [@count="other"], within that the same locale.
-          # > 3. If "x" is "other", it falls back to the path that is completely missing the count item, within that the same locale.
-          # Note: We don't yet implement #3 above, since we haven't decided how lateral inheritance attributes should be represented.
-          plural_rule_category = pluralizer.call(count)
-
-          value = if entry.has_key?(plural_rule_category) || entry.has_key?(:other)
-            entry[plural_rule_category] || entry[:other]
-          else
-            raise InvalidPluralizationData.new(entry, count, plural_rule_category)
-          end
+          key = count == 0 && entry.has_key?(:zero) ? :zero : pluralizer.call(count)
+          raise InvalidPluralizationData.new(entry, count, key) unless entry.has_key?(key)
+          entry[key]
         else
           super
         end
@@ -68,23 +43,13 @@ module I18n
 
       protected
 
-      def pluralizers
-        @pluralizers ||= {}
-      end
-
-      def pluralizer(locale)
-        pluralizers[locale] ||= I18n.t(:'i18n.plural.rule', :locale => locale, :resolve => false)
-      end
-
-      private
+        def pluralizers
+          @pluralizers ||= {}
+        end
 
-      # Normalizes categories of 0.0 and 1.0
-      # and returns the symbolic version
-      def symbolic_count(count)
-        count = 0 if count == 0
-        count = 1 if count == 1
-        count.to_s.to_sym
-      end
+        def pluralizer(locale)
+          pluralizers[locale] ||= I18n.t(:'i18n.plural.rule', :locale => locale, :resolve => false)
+        end
     end
   end
 end

data/lib/i18n/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module I18n
-  VERSION = "1.11.0"
+  VERSION = "1.12.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: i18n
 version: !ruby/object:Gem::Version
-  version: 1.11.0
+  version: 1.12.0
 platform: ruby
 authors:
 - Sven Fuchs
@@ -13,7 +13,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-07-10 00:00:00.000000000 Z
+date: 2022-07-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby