i18n 0.9.0 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dacd9a4d17f9bead5f815c49595c00d1531ed4d7
-  data.tar.gz: 1e4d2ba2b94da73f8dbde1957508a849f7162172
+  metadata.gz: 74991fa815d721be21fc8f4cb3d10dbe7c069059
+  data.tar.gz: 9f325a9e4bc99bc01883448c5871fc13f1eff5a3
 SHA512:
-  metadata.gz: f59e2cfebd1627b138d763d6b035078729cc62104697189e8781003aeb6537e8682e5f4f0ea0ad68e30f36873d895fdb863d8fca3abece2c48cb229e170ccb92
-  data.tar.gz: cd5c4bc9940ccfe400eda8696d8d9bf7630da4c4e67f46a0a6be9f799f64a54fb8d2bdcb9c80dfdeeb3dfc9e14f10d1af715d45dc230415e3491c7b6a187d3e6
+  metadata.gz: 641844afc32707026b98596528a19fe177fef51e5d681f98db746d1980315c85f864dab53c5390f62f4d143d31b68b75f41b88e780478f0b00bde9e9e6cbf7dc
+  data.tar.gz: f62868e06de0b22744316dfcc74d1e928c6263552043bfea8dfbfd985ad660dbdc404e8324d6b5a85dd62d8355935e8cb999a2c21f540fe5fd68725041d05b21

data/lib/i18n/backend/fallbacks.rb

@@ -37,8 +37,7 @@ module I18n
       def translate(locale, key, options = {})
         return super unless options.fetch(:fallback, true)
         return super if options[:fallback_in_progress]
-        original_default = options[:default]
-        extract_non_symbol_default!(options)
+        default = extract_non_symbol_default!(options) if options[:default]
 
         begin
           options[:fallback_in_progress] = true
@@ -56,7 +55,9 @@ module I18n
           options.delete(:fallback_in_progress)
         end
 
-        return super(locale, nil, options.merge(:default => original_default)) if options.key?(:default)
+        return if options.key?(:default) && options[:default].nil?
+
+        return super(locale, nil, options.merge(:default => default)) if default
         throw(:exception, I18n::MissingTranslation.new(locale, key, options))
       end
 

data/lib/i18n/core_ext/hash.rb

@@ -1,6 +1,6 @@
 class Hash
   def slice(*keep_keys)
-    h = self.class.new
+    h = {}
     keep_keys.each { |key| h[key] = fetch(key) if has_key?(key) }
     h
   end unless Hash.method_defined?(:slice)
@@ -21,7 +21,7 @@ class Hash
   MERGER = proc do |key, v1, v2|
     Hash === v1 && Hash === v2 ? v1.merge(v2, &MERGER) : v2
   end
-
+  
   def deep_merge!(data)
     merge!(data, &MERGER)
   end unless Hash.method_defined?(:deep_merge!)

data/lib/i18n/version.rb

@@ -1,3 +1,3 @@
 module I18n
-  VERSION = "0.9.0"
+  VERSION = "0.9.1"
 end

data/test/backend/cache_test.rb

@@ -1,4 +1,5 @@
 require 'test_helper'
+require 'digest/md5'
 
 begin
   require 'active_support'

data/test/backend/fallbacks_test.rb

@@ -64,6 +64,10 @@ class I18nBackendFallbacksTranslateTest < I18n::TestCase
     assert_nil I18n.t(:missing_bar, :locale => :'de-DE', :default => nil)
   end
 
+  test "returns the translation missing message if the default is also missing" do
+    assert_equal 'translation missing: de-DE.missing_bar', I18n.t(:missing_bar, :locale => :'de-DE', :default => [:missing_baz])
+  end
+
   test "returns the :'de-DE' default :baz translation for a missing :'de-DE' when defaults contains Symbol" do
     assert_equal 'Baz in :de-DE', I18n.t(:missing_foo, :locale => :'de-DE', :default => [:baz, "Default Bar"])
   end

data/test/core_ext/hash_test.rb

@@ -20,12 +20,6 @@ class I18nCoreExtHashInterpolationTest < I18n::TestCase
     assert_equal expected, hash.slice(:foo, :not_here)
   end
 
-  test "#slice maintains subclasses of Hash" do
-    klass = Class.new(Hash)
-    hash = klass[:foo, 'bar', :baz, 'bar']
-    assert_instance_of klass,  hash.slice(:foo)
-  end
-
   test "#except" do
     hash = { :foo => 'bar',  :baz => 'bar' }
     expected = { :foo => 'bar' }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: i18n
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.9.1
 platform: ruby
 authors:
 - Sven Fuchs
@@ -9,10 +9,11 @@ authors:
 - Matt Aimonetti
 - Stephan Soller
 - Saimon Moore
+- Ryan Bigg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-15 00:00:00.000000000 Z
+date: 2017-11-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby