i18n 1.7.1 → 1.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d2d329752d461ff5287721f9bd5fee7f33a102562eaee86e6a9ab2cb2fbdae44
-  data.tar.gz: 305fc47d8004f06f2589d1bccb015c772e1122c18e4328956a89833e473f6e29
+  metadata.gz: 1feacf530f7c7d776e429106178388b7f74a9d5dc2c56ff84f54cc69e3387f9d
+  data.tar.gz: b718873f023bb27b997c6bd9e57711c61867aa011db33bab0c92c6863d2c6852
 SHA512:
-  metadata.gz: 16bc9ad463daaea66200aac4eade44ab199cdd4cf29e0a2d0eb0de3230ceee005d67aaa03459e2f364d1638d2cc6e9f3f8b378f7f0b6cff685f88e66044d9f1a
-  data.tar.gz: 157350c5f080cb7fc1ba074411c06d364332d66e2e23f512f1a263fcf9e23ff309f2e696da582862effd9d22a9207c8f6191fbaf5806c3f94ab1b212e5630c00
+  metadata.gz: f50c1c99b2582d6fb03e6c6782c8213e2b52e2ef1f12dd91880cf33d1458f3b24b898189cf684070bfe4c6bc268ee2d1523fb0bc966d737ffbfbcc32dddc30c3
+  data.tar.gz: c7e8e494a4c9d379f378fd6dda2320052b5be3c2ada7596ea32ba91535c491aa4581aaac1c7e672920fe5e4c70bfeaee872c7ef89b0e57791ca108077a397609

data/lib/i18n/backend/chain.rb

@@ -101,8 +101,7 @@ module I18n
                 init_translations unless initialized?
                 translations
               end
-
-              memo.deep_merge!(partial_translations)
+              memo.deep_merge!(partial_translations) { |_, a, b| b || a }
             end
           end
 

data/lib/i18n/core_ext/hash.rb

@@ -18,12 +18,18 @@ 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)
+        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/version.rb

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

metadata

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