i18n 1.8.0 → 1.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1feacf530f7c7d776e429106178388b7f74a9d5dc2c56ff84f54cc69e3387f9d
-  data.tar.gz: b718873f023bb27b997c6bd9e57711c61867aa011db33bab0c92c6863d2c6852
+  metadata.gz: d32ff36d5385248b7ee10b2f56290d334d8960c4bf2ad235586cb3ced8076ba3
+  data.tar.gz: 61ce5e019df9b588683df2f5d7450d9a59e11c1113149c621a52ade0e8008c12
 SHA512:
-  metadata.gz: f50c1c99b2582d6fb03e6c6782c8213e2b52e2ef1f12dd91880cf33d1458f3b24b898189cf684070bfe4c6bc268ee2d1523fb0bc966d737ffbfbcc32dddc30c3
-  data.tar.gz: c7e8e494a4c9d379f378fd6dda2320052b5be3c2ada7596ea32ba91535c491aa4581aaac1c7e672920fe5e4c70bfeaee872c7ef89b0e57791ca108077a397609
+  metadata.gz: 447fbf79001dabdeb67c2f40fced56fc33996c97e04aa9fafed6944f105c57d8b76f2a01a7f962501f3b9c746d0f20e14815210e9cdad5c38387f7ea75e95949
+  data.tar.gz: 0a520450edfe558d3441e1d14bbd5a23c6e3ee2814286979722a43c8e570f4d130c3a953c558ed1ab4e9149035752b59a0d2a41475ddb84122825839bdcf3ecd

data/lib/i18n/backend/chain.rb

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

data/lib/i18n/core_ext/hash.rb

@@ -18,18 +18,12 @@ module I18n
         end
       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
+      # 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
         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.8.0"
+  VERSION = "1.8.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: i18n
 version: !ruby/object:Gem::Version
-  version: 1.8.0
+  version: 1.8.1
 platform: ruby
 authors:
 - Sven Fuchs
@@ -117,7 +117,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.5
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: New wave Internationalization support for Ruby