i18n 1.6.0 → 1.8.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2b03b84d726d3cafa7ea2ecaa6f258cb911696c338cb32c769f71b6d62ca5fb5
-  data.tar.gz: 7a489bf447e9fedee8fd043cc8ba324c0afc0c34701fbfeff5f15b1c1f4fa6b4
+  metadata.gz: 63d76facf7fc1bb9f1f7fca47cec61259726d0879a7e187646f54a7e94f0f73c
+  data.tar.gz: ca27ecf10f4cf612a57fa0747aeb2431f42fa08210ce1df79675c17d52b5c203
 SHA512:
-  metadata.gz: 534659c40a8df9eb3fd9a123b779de0f1b66471ecd3fb35e2083128193f51aeea95df6aad06039b6309932a6efb3426c525a8759e70c1104754fdd921732d6cd
-  data.tar.gz: caddebe447a797be3dde1607e74d826588ee13ee1317c6abfbb08cbd8a22d79a6aa10a84d3fd21fa45ca9348317aa0e0aafe1c408d4e1c989fbee7f09cd87606
+  metadata.gz: 3007d330c4b3c1d88feb69d3d4f877cfd19d15461929b7af70c902090ec8872e7dfe2c6a2ed0bec56111b3146fe7f2c1718c9e70aaa424369f6d5f8fa4a4ae42
+  data.tar.gz: 4c2119abc3a28a9d2a18e429befb3ade43de7b5cf65c48f2c67896905d30358759ada31c8442414fd6d859a6a45f52441b7ca05ccac18790ed3f6ea0edc3b97e

data/README.md

@@ -1,8 +1,8 @@
 # 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.
+Ruby internationalization and localization (i18n) solution.
 
 Currently maintained by @radar.
 
@@ -12,7 +12,7 @@ Currently maintained by @radar.
 
 You will most commonly use this library within a Rails app.
 
-[See the Rails Guide](http://guides.rubyonrails.org/i18n.html) for an example of its usage.
+[See the Rails Guide](https://guides.rubyonrails.org/i18n.html) for an example of its usage.
 
 ### Ruby (without Rails)
 
@@ -51,16 +51,16 @@ I18n.t(:test) # => "Dies ist ein Test"
 
 ## Features
 
-* translation and localization
-* interpolation of values to translations (Ruby 1.9 compatible syntax)
-* pluralization (CLDR compatible)
-* customizable transliteration to ASCII
-* flexible defaults
-* bulk lookup
-* lambdas as translation data
-* custom key/scope separator
-* custom exception handlers
-* extensible architecture with a swappable backend
+* Translation and localization
+* Interpolation of values to translations
+* Pluralization (CLDR compatible)
+* Customizable transliteration to ASCII
+* Flexible defaults
+* Bulk lookup
+* Lambdas as translation data
+* Custom key/scope separator
+* Custom exception handlers
+* Extensible architecture with a swappable backend
 
 ## Pluggable Features
 
@@ -95,7 +95,7 @@ particular tests in different test cases.
 The reason for this is that we need to enforce the I18n API across various
 combinations of extensions. E.g. the Simple backend alone needs to support
 the same API as any combination of feature and/or optimization modules included
-to the Simple backend. We test this by reusing the same API defition (implemented
+to the Simple backend. We test this by reusing the same API definition (implemented
 as test methods) in test cases with different setups.
 
 You can find the test cases that enforce the API in test/api. And you can find
@@ -106,19 +106,16 @@ follow the usual test setup and should be easy to grok.
 
 ## More Documentation
 
-Additional documentation can be found here: https://github.com/svenfuchs/i18n/wiki
-
-## Authors
-
-* [Sven Fuchs](http://www.artweb-design.de)
-* [Joshua Harvey](http://www.workingwithrails.com/person/759-joshua-harvey)
-* [Stephan Soller](http://www.arkanis-development.de)
-* [Saimon Moore](http://saimonmoore.net)
-* [Matt Aimonetti](https://matt.aimonetti.net/)
+Additional documentation can be found here: https://github.com/ruby-i18n/i18n/wiki
 
 ## Contributors
 
-https://github.com/svenfuchs/i18n/graphs/contributors
+* @radar
+* @carlosantoniodasilva
+* @josevalim
+* @knapo
+* @tigrish
+* [and many more](https://github.com/ruby-i18n/i18n/graphs/contributors)
 
 ## License
 

data/lib/i18n.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'concurrent/map'
+require 'concurrent/hash'
 
 require 'i18n/version'
 require 'i18n/exceptions'
@@ -33,7 +34,7 @@ module I18n
   EMPTY_HASH = {}.freeze
 
   def self.new_double_nested_cache # :nodoc:
-    Concurrent::Map.new { |h,k| h[k] = Concurrent::Map.new }
+    Concurrent::Map.new { |h, k| h[k] = Concurrent::Map.new }
   end
 
   module Base
@@ -115,7 +116,7 @@ module I18n
     # *PLURALIZATION*
     #
     # Translation data can contain pluralized translations. Pluralized translations
-    # are arrays of singluar/plural versions of translations like <tt>['Foo', 'Foos']</tt>.
+    # are arrays of singular/plural versions of translations like <tt>['Foo', 'Foos']</tt>.
     #
     # Note that <tt>I18n::Backend::Simple</tt> only supports an algorithm for English
     # pluralization rules. Other algorithms can be supported by custom backends.
@@ -173,10 +174,26 @@ module I18n
     #
     # It is recommended to use/implement lambdas in an "idempotent" way. E.g. when
     # a cache layer is put in front of I18n.translate it will generate a cache key
-    # from the argument values passed to #translate. Therefor your lambdas should
+    # from the argument values passed to #translate. Therefore your lambdas should
     # always return the same translations/values per unique combination of argument
     # values.
-    def translate(key = nil, *, throw: false, raise: false, locale: nil, **options) # TODO deprecate :raise
+    #
+    # *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
       enforce_available_locales!(locale)
@@ -201,17 +218,17 @@ module I18n
 
     # Wrapper for <tt>translate</tt> that adds <tt>:raise => true</tt>. With
     # this option, if no translation is found, it will raise <tt>I18n::MissingTranslationData</tt>
-    def translate!(key, options = EMPTY_HASH)
-      translate(key, options.merge(:raise => true))
+    def translate!(key, **options)
+      translate(key, **options, raise: true)
     end
     alias :t! :translate!
 
     # Returns true if a translation exists for a given key, otherwise returns false.
-    def exists?(key, _locale = nil, locale: _locale)
+    def exists?(key, _locale = nil, locale: _locale, **options)
       locale ||= config.locale
       raise Disabled.new('exists?') if locale == false
       raise I18n::ArgumentError if key.is_a?(String) && key.empty?
-      config.backend.exists?(locale, key)
+      config.backend.exists?(locale, key, options)
     end
 
     # Transliterates UTF-8 characters to ASCII. By default this method will
@@ -265,7 +282,7 @@ module I18n
     #     I18n.transliterate("Jürgen") # => "Juergen"
     #     I18n.transliterate("Jürgen", :locale => :en) # => "Jurgen"
     #     I18n.transliterate("Jürgen", :locale => :de) # => "Juergen"
-    def transliterate(key, *, throw: false, raise: false, locale: nil, replacement: nil, **options)
+    def transliterate(key, throw: false, raise: false, locale: nil, replacement: nil, **options)
       locale ||= config.locale
       raise Disabled.new('transliterate') if locale == false
       enforce_available_locales!(locale)
@@ -373,7 +390,7 @@ module I18n
       @@normalized_key_cache[separator][key] ||=
         case key
         when Array
-          key.map { |k| normalize_key(k, separator) }.flatten
+          key.flat_map { |k| normalize_key(k, separator) }
         else
           keys = key.to_s.split(separator)
           keys.delete('')

data/lib/i18n/backend/base.rb

@@ -64,7 +64,7 @@ module I18n
         entry
       end
 
-      def exists?(locale, key)
+      def exists?(locale, key, options = EMPTY_HASH)
         lookup(locale, key) != nil
       end
 
@@ -81,7 +81,7 @@ module I18n
           key  = format
           type = object.respond_to?(:sec) ? 'time' : 'date'
           options = options.merge(:raise => true, :object => object, :locale => locale)
-          format  = I18n.t(:"#{type}.formats.#{key}", options)
+          format  = I18n.t(:"#{type}.formats.#{key}", **options)
         end
 
         format = translate_localization_format(locale, object, format, options)
@@ -122,7 +122,7 @@ module I18n
         # first translation that can be resolved. Otherwise it tries to resolve
         # the translation directly.
         def default(locale, object, subject, options = EMPTY_HASH)
-          options = options.dup.reject { |key, value| key == :default }
+          options = options.reject { |key, value| key == :default }
           case subject
           when Array
             subject.each do |item|
@@ -143,10 +143,10 @@ module I18n
           result = catch(:exception) do
             case subject
             when Symbol
-              I18n.translate(subject, options.merge(:locale => locale, :throw => true))
+              I18n.translate(subject, **options.merge(:locale => locale, :throw => true))
             when Proc
               date_or_time = options.delete(:object) || object
-              resolve(locale, object, subject.call(date_or_time, options))
+              resolve(locale, object, subject.call(date_or_time, **options))
             else
               subject
             end
@@ -163,7 +163,8 @@ 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
+          entry = entry.reject { |k, _v| k == :attributes } if entry.is_a?(Hash)
+          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/cache.rb

@@ -17,11 +17,11 @@
 #
 # The cache_key implementation by default assumes you pass values that return
 # a valid key from #hash (see
-# http://www.ruby-doc.org/core/classes/Object.html#M000337). However, you can
+# https://www.ruby-doc.org/core/classes/Object.html#M000337). However, you can
 # configure your own digest method via which responds to #hexdigest (see
-# http://ruby-doc.org/stdlib/libdoc/digest/rdoc/index.html):
+# https://ruby-doc.org/stdlib/libdoc/openssl/rdoc/OpenSSL/Digest.html):
 #
-#   I18n.cache_key_digest = Digest::MD5.new
+#   I18n.cache_key_digest = OpenSSL::Digest::SHA256.new
 #
 # If you use a lambda as a default value in your translation like this:
 #

data/lib/i18n/backend/cache_file.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'digest/sha2'
+require 'openssl'
 
 module I18n
   module Backend
@@ -19,7 +19,7 @@ module I18n
         key = I18n::Backend::Flatten.escape_default_separator(normalized_path(filename))
         old_mtime, old_digest = initialized && lookup(:i18n, key, :load_file)
         return if (mtime = File.mtime(filename).to_i) == old_mtime ||
-                  (digest = Digest::SHA2.file(filename).hexdigest) == old_digest
+                  (digest = OpenSSL::Digest::SHA256.file(filename).hexdigest) == old_digest
         super
         store_translations(:i18n, load_file: { key => [mtime, digest] })
       end

data/lib/i18n/backend/chain.rb

@@ -73,9 +73,9 @@ module I18n
           throw(:exception, I18n::MissingTranslation.new(locale, key, options))
         end
 
-        def exists?(locale, key)
+        def exists?(locale, key, options = EMPTY_HASH)
           backends.any? do |backend|
-            backend.exists?(locale, key)
+            backend.exists?(locale, key, options)
           end
         end
 
@@ -96,9 +96,12 @@ module I18n
           end
 
           def translations
-            backends.first.instance_eval do
-              init_translations unless initialized?
-              translations
+            backends.reverse.each_with_object({}) do |backend, memo|
+              partial_translations = backend.instance_eval do
+                init_translations unless initialized?
+                translations
+              end
+              memo.deep_merge!(partial_translations) { |_, a, b| b || a }
             end
           end
 

data/lib/i18n/backend/fallbacks.rb

@@ -16,11 +16,13 @@ module I18n
     # Returns the current fallbacks implementation. Defaults to +I18n::Locale::Fallbacks+.
     def fallbacks
       @@fallbacks ||= I18n::Locale::Fallbacks.new
+      Thread.current[:i18n_fallbacks] || @@fallbacks
     end
 
     # Sets the current fallbacks implementation. Use this to set a different fallbacks implementation.
     def fallbacks=(fallbacks)
-      @@fallbacks = fallbacks
+      @@fallbacks = fallbacks.is_a?(Array) ? I18n::Locale::Fallbacks.new(fallbacks) : fallbacks
+      Thread.current[:i18n_fallbacks] = @@fallbacks
     end
   end
 
@@ -46,7 +48,10 @@ module I18n
           begin
             catch(:exception) do
               result = super(fallback, key, fallback_options)
-              return result unless result.nil?
+              unless result.nil?
+                on_fallback(locale, fallback, key, options) if locale.to_s != fallback.to_s
+                return result
+              end
             end
           rescue I18n::InvalidLocale
             # we do nothing when the locale is invalid, as this is a fallback anyways.
@@ -68,7 +73,8 @@ module I18n
         return first_non_symbol_default
       end
 
-      def exists?(locale, key)
+      def exists?(locale, key, options = EMPTY_HASH)
+        return super unless options.fetch(:fallback, true)
         I18n.fallbacks[locale].each do |fallback|
           begin
             return true if super(fallback, key)
@@ -79,6 +85,13 @@ module I18n
 
         false
       end
+
+      private
+
+        # Overwrite on_fallback to add specified logic when the fallback succeeds.
+        def on_fallback(_original_locale, _fallback_locale, _key, _optoins)
+          nil
+        end
     end
   end
 end

data/lib/i18n/backend/flatten.rb

@@ -18,14 +18,17 @@ module I18n
       # and creates way less objects than the one at I18n.normalize_keys.
       # It also handles escaping the translation keys.
       def self.normalize_flat_keys(locale, key, scope, separator)
-        keys = [scope, key].flatten.compact
+        keys = [scope, key]
+        keys.flatten!
+        keys.compact!
+
         separator ||= I18n.default_separator
 
         if separator != FLATTEN_SEPARATOR
-          keys.map! do |k|
-            k.to_s.tr("#{FLATTEN_SEPARATOR}#{separator}",
-              "#{SEPARATOR_ESCAPE_CHAR}#{FLATTEN_SEPARATOR}")
-          end
+          from_str = "#{FLATTEN_SEPARATOR}#{separator}"
+          to_str = "#{SEPARATOR_ESCAPE_CHAR}#{FLATTEN_SEPARATOR}"
+
+          keys.map! { |k| k.to_s.tr from_str, to_str }
         end
 
         keys.join(".")

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
 
         pluralizer = pluralizer(locale)
         if pluralizer.respond_to?(:call)

data/lib/i18n/backend/simple.rb

@@ -21,8 +21,6 @@ module I18n
     class Simple
       using I18n::HashRefinements
 
-      (class << self; self; end).class_eval { public :include }
-
       module Implementation
         include Base
 
@@ -42,7 +40,7 @@ module I18n
             return data
           end
           locale = locale.to_sym
-          translations[locale] ||= {}
+          translations[locale] ||= Concurrent::Hash.new
           data = data.deep_symbolize_keys
           translations[locale].deep_merge!(data)
         end
@@ -73,7 +71,7 @@ module I18n
           # call `init_translations`
           init_translations if do_init && !initialized?
 
-          @translations ||= {}
+          @translations ||= Concurrent::Hash.new { |h, k| h[k] = Concurrent::Hash.new }
         end
 
       protected

data/lib/i18n/core_ext/hash.rb

@@ -4,7 +4,7 @@ module I18n
       using I18n::HashRefinements
       def except(*keys)
         dup.except!(*keys)
-      end
+      end unless method_defined?(:except)
 
       def except!(*keys)
         keys.each { |key| delete(key) }
@@ -18,12 +18,24 @@ module I18n
         end
       end
 
-      # deep_merge_hash! by Stefan Rusterholz, see http://www.ruby-forum.com/topic/142809
-      def deep_merge!(data)
-        merger = lambda do |_key, v1, v2|
-          Hash === v1 && Hash === v2 ? v1.merge(v2, &merger) : v2
+      # deep_merge from activesupport 5
+      # Copyright (c) 2005-2019 David Heinemeier Hansson
+      def deep_merge(other_hash, &block)
+        dup.deep_merge!(other_hash, &block)
+      end
+
+      # deep_merge! from activesupport 5
+      # Copyright (c) 2005-2019 David Heinemeier Hansson
+      def deep_merge!(other_hash, &block)
+        merge!(other_hash) do |key, this_val, other_val|
+          if this_val.is_a?(Hash) && other_val.is_a?(Hash)
+            this_val.deep_merge(other_val, &block)
+          elsif block_given?
+            block.call(key, this_val, other_val)
+          else
+            other_val
+          end
         end
-        merge!(data, &merger)
       end
 
       def symbolize_key(key)

data/lib/i18n/gettext/helpers.rb

@@ -19,7 +19,7 @@ module I18n
       end
 
       def gettext(msgid, options = EMPTY_HASH)
-        I18n.t(msgid, { :default => msgid, :separator => '|' }.merge(options))
+        I18n.t(msgid, **{:default => msgid, :separator => '|'}.merge(options))
       end
       alias _ gettext
 

data/lib/i18n/interpolate/ruby.rb

@@ -4,11 +4,11 @@
 module I18n
   DEFAULT_INTERPOLATION_PATTERNS = [
     /%%/,
-    /%\{(\w+)\}/,                               # matches placeholders like "%{foo}"
+    /%\{([\w|]+)\}/,                            # matches placeholders like "%{foo} or %{foo|word}"
     /%<(\w+)>(.*?\d*\.?\d*[bBdiouxXeEfgGcps])/  # matches placeholders like "%<foo>.d"
   ].freeze
   INTERPOLATION_PATTERN = Regexp.union(DEFAULT_INTERPOLATION_PATTERNS)
-  deprecate_constant :INTERPOLATION_PATTERN if method_defined? :INTERPOLATION_PATTERN
+  deprecate_constant :INTERPOLATION_PATTERN
 
   class << self
     # Return String or raises MissingInterpolationArgument exception.

data/lib/i18n/locale/fallbacks.rb

@@ -26,7 +26,7 @@
 #
 #   I18n.default_locale = :"en-US"
 #   I18n.fallbacks = I18n::Locale::Fallbacks.new(:"de-AT" => :"de-DE")
-#   I18n.fallbacks[:"de-AT"] # => [:"de-AT", :"de-DE", :de, :"en-US", :en]
+#   I18n.fallbacks[:"de-AT"] # => [:"de-AT", :de, :"de-DE"]
 #
 #   # using a custom locale as default fallback locale
 #
@@ -60,12 +60,13 @@ module I18n
       end
 
       def defaults=(defaults)
-        @defaults = defaults.map { |default| compute(default, false) }.flatten
+        @defaults = defaults.flat_map { |default| compute(default, false) }
       end
       attr_reader :defaults
 
       def [](locale)
         raise InvalidLocale.new(locale) if locale.nil?
+        raise Disabled.new('fallback#[]') if locale == false
         locale = locale.to_sym
         super || store(locale, compute(locale))
       end
@@ -83,13 +84,15 @@ module I18n
       protected
 
       def compute(tags, include_defaults = true, exclude = [])
-        result = Array(tags).collect do |tag|
+        result = Array(tags).flat_map do |tag|
           tags = I18n::Locale::Tag.tag(tag).self_and_parents.map! { |t| t.to_sym } - exclude
           tags.each { |_tag| tags += compute(@map[_tag], false, exclude + tags) if @map[_tag] }
           tags
-        end.flatten
+        end
         result.push(*defaults) if include_defaults
-        result.uniq.compact
+        result.uniq!
+        result.compact!
+        result
       end
     end
   end

data/lib/i18n/locale/tag/parents.rb

@@ -3,18 +3,20 @@ module I18n
     module Tag
       module Parents
         def parent
-          @parent ||= begin
-            segs = to_a.compact
-            segs.length > 1 ? self.class.tag(*segs[0..(segs.length-2)].join('-')) : nil
-          end
+          @parent ||=
+            begin
+              segs = to_a
+              segs.compact!
+              segs.length > 1 ? self.class.tag(*segs[0..(segs.length - 2)].join('-')) : nil
+            end
         end
 
         def self_and_parents
-          @self_and_parents ||= [self] + parents
+          @self_and_parents ||= [self].concat parents
         end
 
         def parents
-          @parents ||= ([parent] + (parent ? parent.parents : [])).compact
+          @parents ||= parent ? [parent].concat(parent.parents) : []
         end
       end
     end

data/lib/i18n/locale/tag/simple.rb

@@ -19,7 +19,7 @@ module I18n
         end
 
         def subtags
-          @subtags = tag.to_s.split('-').map { |subtag| subtag.to_s }
+          @subtags = tag.to_s.split('-').map!(&:to_s)
         end
 
         def to_sym

data/lib/i18n/tests/interpolation.rb

@@ -24,6 +24,10 @@ module I18n
         assert_equal 'Hi David!', interpolate(:default => 'Hi %{name}!', :name => 'David')
       end
 
+      test "interpolation: works with a pipe" do
+        assert_equal 'Hi david!', interpolate(:default => 'Hi %{name|lowercase}!', :'name|lowercase' => 'david')
+      end
+
       test "interpolation: given a nil value it still interpolates it into the string" do
         assert_equal 'Hi !', interpolate(:default => 'Hi %{name}!', :name => nil)
       end

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/tests/localization/date.rb

@@ -68,9 +68,9 @@ module I18n
 
         test "localize Date: does not modify the options hash" do
           options = { :format => '%b', :locale => :de }
-          assert_equal 'Mär', I18n.l(@date, options)
+          assert_equal 'Mär', I18n.l(@date, **options)
           assert_equal({ :format => '%b', :locale => :de }, options)
-          assert_nothing_raised { I18n.l(@date, options.freeze) }
+          assert_nothing_raised { I18n.l(@date, **options.freeze) }
         end
 
         test "localize Date: given nil with default value it returns default" do

data/lib/i18n/tests/localization/procs.rb

@@ -52,19 +52,20 @@ module I18n
         test "localize Time: given a format that resolves to a Proc it calls the Proc with the object" do
           setup_time_proc_translations
           time = ::Time.utc(2008, 3, 1, 6, 0)
-          assert_equal I18n::Tests::Localization::Procs.inspect_args([time, {}]), I18n.l(time, :format => :proc, :locale => :ru)
+          assert_equal I18n::Tests::Localization::Procs.inspect_args([time], {}), I18n.l(time, :format => :proc, :locale => :ru)
         end
 
         test "localize Time: given a format that resolves to a Proc it calls the Proc with the object and extra options" do
           setup_time_proc_translations
           time = ::Time.utc(2008, 3, 1, 6, 0)
           options = { :foo => 'foo' }
-          assert_equal I18n::Tests::Localization::Procs.inspect_args([time, options]), I18n.l(time, options.merge(:format => :proc, :locale => :ru))
+          assert_equal I18n::Tests::Localization::Procs.inspect_args([time], options), I18n.l(time, **options.merge(:format => :proc, :locale => :ru))
         end
 
         protected
 
-          def self.inspect_args(args)
+          def self.inspect_args(args, kwargs)
+            args << kwargs
             args = args.map do |arg|
               case arg
               when ::Time, ::DateTime
@@ -85,12 +86,12 @@ module I18n
             I18n.backend.store_translations :ru, {
               :time => {
                 :formats => {
-                  :proc => lambda { |*args| I18n::Tests::Localization::Procs.inspect_args(args) }
+                  :proc => lambda { |*args, **kwargs| I18n::Tests::Localization::Procs.inspect_args(args, kwargs) }
                 }
               },
               :date => {
                 :formats => {
-                  :proc => lambda { |*args| I18n::Tests::Localization::Procs.inspect_args(args) }
+                  :proc => lambda { |*args, **kwargs| I18n::Tests::Localization::Procs.inspect_args(args, kwargs) }
                 },
                 :'day_names' => lambda { |key, options|
                   (options[:format] =~ /^%A/) ?

data/lib/i18n/tests/lookup.rb

@@ -43,9 +43,9 @@ module I18n
 
       test "lookup: does not modify the options hash" do
         options = {}
-        assert_equal "a", I18n.t(:string, options)
+        assert_equal "a", I18n.t(:string, **options)
         assert_equal({}, options)
-        assert_nothing_raised { I18n.t(:string, options.freeze) }
+        assert_nothing_raised { I18n.t(:string, **options.freeze) }
       end
 
       test "lookup: given an array of keys it translates all of them" do

data/lib/i18n/tests/procs.rb

@@ -8,6 +8,11 @@ module I18n
         assert_equal '[:a_lambda, {:foo=>"foo"}]', I18n.t(:a_lambda, :foo => 'foo')
       end
 
+      test "lookup: given a translation is a proc it passes the interpolation values as keyword arguments" do
+        I18n.backend.store_translations(:en, :a_lambda => lambda { |key, foo:, **| I18n::Tests::Procs.filter_args(key, foo: foo) })
+        assert_equal '[:a_lambda, {:foo=>"foo"}]', I18n.t(:a_lambda, :foo => 'foo')
+      end
+
       test "defaults: given a default is a Proc it calls it with the key and interpolation values" do
         proc = lambda { |*args| I18n::Tests::Procs.filter_args(*args) }
         assert_equal '[nil, {:foo=>"foo"}]', I18n.t(nil, :default => proc, :foo => 'foo')

data/lib/i18n/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: i18n
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.8.10
 platform: ruby
 authors:
 - Sven Fuchs
@@ -10,18 +10,18 @@ authors:
 - Stephan Soller
 - Saimon Moore
 - Ryan Bigg
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-03-03 00:00:00.000000000 Z
+date: 2021-03-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: concurrent-ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+  name: concurrent-ruby
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -82,27 +82,15 @@ files:
 - lib/i18n/tests/pluralization.rb
 - lib/i18n/tests/procs.rb
 - lib/i18n/version.rb
-homepage: http://github.com/ruby-i18n/i18n
+homepage: https://github.com/ruby-i18n/i18n
 licenses:
 - MIT
 metadata:
-  bug_tracker_uri: https://github.com/svenfuchs/i18n/issues
-  changelog_uri: https://github.com/svenfuchs/i18n/releases
+  bug_tracker_uri: https://github.com/ruby-i18n/i18n/issues
+  changelog_uri: https://github.com/ruby-i18n/i18n/releases
   documentation_uri: https://guides.rubyonrails.org/i18n.html
-  source_code_uri: https://github.com/svenfuchs/i18n
-post_install_message: |2+
-
-  HEADS UP! i18n 1.1 changed fallbacks to exclude default locale.
-  But that may break your application.
-
-  Please check your Rails app for 'config.i18n.fallbacks = true'.
-  If you're using I18n (>= 1.1.0) and Rails (< 5.2.2), this should be
-  'config.i18n.fallbacks = [I18n.default_locale]'.
-  If not, fallbacks will be broken in your app by I18n 1.1.x.
-
-  For more info see:
-  https://github.com/svenfuchs/i18n/releases/tag/v1.1.0
-
+  source_code_uri: https://github.com/ruby-i18n/i18n
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -117,8 +105,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.5
 requirements: []
-rubygems_version: 3.0.2
-signing_key: 
+rubygems_version: 3.0.6
+signing_key:
 specification_version: 4
 summary: New wave Internationalization support for Ruby
 test_files: []