i18n 1.7.0 → 1.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dd80c4dac859bf40aa5a70cab46357ea469fe054757dc747d8976a243e619bb0
-  data.tar.gz: f396a7f27e9295a336dbccc489828439816de7dbc7b7fd5f8bd7863c907d813a
+  metadata.gz: d2d329752d461ff5287721f9bd5fee7f33a102562eaee86e6a9ab2cb2fbdae44
+  data.tar.gz: 305fc47d8004f06f2589d1bccb015c772e1122c18e4328956a89833e473f6e29
 SHA512:
-  metadata.gz: 1be60c0724e1bb2054dfaecc1f732d3a6d52e2eaa600947899938f591b0cbb3af43614d57e2157d9f6a35f18b8b3119e65cba605b32cef33c4e361be2e84f9aa
-  data.tar.gz: 973b4f37394853d37b10a8801cc6d3b33f934601ccd492a1c93df6f05c13cb780068403c4e12216d0a831489babd0fcec9eb04ad0c68ebbaf57a94b76ad24ed2
+  metadata.gz: 16bc9ad463daaea66200aac4eade44ab199cdd4cf29e0a2d0eb0de3230ceee005d67aaa03459e2f364d1638d2cc6e9f3f8b378f7f0b6cff685f88e66044d9f1a
+  data.tar.gz: 157350c5f080cb7fc1ba074411c06d364332d66e2e23f512f1a263fcf9e23ff309f2e696da582862effd9d22a9207c8f6191fbaf5806c3f94ab1b212e5630c00

data/README.md

@@ -1,6 +1,6 @@
 # Ruby I18n
 
-[![Build Status](https://api.travis-ci.org/ruby-i18n/i18n.svg?branch=master)](https://travis-ci.org/ruby-i18n/i18n)
+[![Build Status](https://github.com/ruby-i18n/i18n/workflows/Ruby/badge.svg)](https://github.com/ruby-i18n/i18n/actions?query=workflow%3ARuby)
 
 Ruby Internationalization and localization solution.
 

data/lib/i18n.rb

@@ -176,6 +176,22 @@ module I18n
     # from the argument values passed to #translate. Therefore your lambdas should
     # always return the same translations/values per unique combination of argument
     # values.
+    #
+    # *Ruby 2.7+ keyword arguments warning*
+    #
+    # This method uses keyword arguments.
+    # There is a breaking change in ruby that produces warning with ruby 2.7 and won't work as expected with ruby 3.0
+    # The "hash" parameter must be passed as keyword argument.
+    #
+    # Good:
+    #  I18n.t(:salutation, :gender => 'w', :name => 'Smith')
+    #  I18n.t(:salutation, **{ :gender => 'w', :name => 'Smith' })
+    #  I18n.t(:salutation, **any_hash)
+    #
+    # Bad:
+    #  I18n.t(:salutation, { :gender => 'w', :name => 'Smith' })
+    #  I18n.t(:salutation, any_hash)
+    #
     def translate(key = nil, *, throw: false, raise: false, locale: nil, **options) # TODO deprecate :raise
       locale ||= config.locale
       raise Disabled.new('t') if locale == false

data/lib/i18n/backend/base.rb

@@ -163,7 +163,7 @@ module I18n
         #   not standard with regards to the CLDR pluralization rules.
         # Other backends can implement more flexible or complex pluralization rules.
         def pluralize(locale, entry, count)
-          return entry unless entry.is_a?(Hash) && count
+          return entry unless entry.is_a?(Hash) && count && entry.values.none? { |v| v.is_a?(Hash) }
 
           key = pluralization_key(entry, count)
           raise InvalidPluralizationData.new(entry, count, key) unless entry.has_key?(key)

data/lib/i18n/backend/pluralization.rb

@@ -29,7 +29,7 @@ module I18n
       # 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) and count
+        return entry unless entry.is_a?(Hash) && count && entry.values.none? { |v| v.is_a?(Hash) }
 
         pluralizer = pluralizer(locale)
         if pluralizer.respond_to?(:call)

data/lib/i18n/tests/link.rb

@@ -26,7 +26,7 @@ module I18n
         }
         assert_equal('linked', I18n.backend.translate('en', :'foo.link'))
       end
-      
+
       test "linked lookup: if a dot-separated key resolves to a dot-separated symbol it looks up the symbol" do
         I18n.backend.store_translations 'en', {
           :foo => { :link   => :"bar.linked" },
@@ -51,6 +51,16 @@ module I18n
         assert_equal "can't be blank", I18n.t(:"activerecord.errors.messages.blank")
         assert_equal "can't be blank", I18n.t(:"activerecord.errors.messages.blank")
       end
+
+      test "linked lookup: a link can resolve with option :count" do
+        I18n.backend.store_translations 'en', {
+          :counter => :counted,
+          :counted => { :foo => { :one => "one", :other => "other" }, :bar => "bar" }
+        }
+        assert_equal "one", I18n.t(:'counter.foo', count: 1)
+        assert_equal "other", I18n.t(:'counter.foo', count: 2)
+        assert_equal "bar", I18n.t(:'counter.bar', count: 3)
+      end
     end
   end
 end

data/lib/i18n/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: i18n
 version: !ruby/object:Gem::Version
-  version: 1.7.0
+  version: 1.7.1
 platform: ruby
 authors:
 - Sven Fuchs
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-04 00:00:00.000000000 Z
+date: 2020-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -117,7 +117,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.5
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: New wave Internationalization support for Ruby