clear cache on merge! too ...

attilahorvath · Sep 8, 2016 · e755bbe · e755bbe
1 parent 70e6249
commit e755bbe
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 0 deletions.
diff --git a/lib/i18n/globals.rb b/lib/i18n/globals.rb
@@ -25,6 +25,7 @@ def clear
 
       def merge!(val)
         # see annotate hash below why whis must be done
+        clear_cache
         val.select { |_, v| v.is_a?(Hash) }.each { |_, v| annotate_hash(v) }
         super(val)
       end

diff --git a/test/test_i18n_globals.rb b/test/test_i18n_globals.rb
@@ -130,4 +130,16 @@ def test_that_cache_is_cleared_after_setting_a_new_global
 
     assert_equal 'Hi there, Dobby!', I18n.translate('greeting')
   end
+
+  def test_that_cache_is_cleared_after_merging_a_new_global
+    I18n.config.globals = {
+      name: 'Greg'
+    }
+
+    assert_equal 'Hi there, Greg!', I18n.translate('greeting')
+
+    I18n.config.globals.merge!(name: 'Dobby')
+
+    assert_equal 'Hi there, Dobby!', I18n.translate('greeting')
+  end
 end