i18n 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6abb11703c717406a1a4e5df13e88679656a3bb798cd0141e4ef9961fed64056
-  data.tar.gz: 1e633332f63054b3919c887a853a1bb4348025550531bf3f499a924a1b37acf5
+  metadata.gz: 00ca216533d9fa4b869395ffc218a4c048b5d86c3db3b93d6cae489e7578a7a9
+  data.tar.gz: 805b70e0c7cc30d1c11c60ccb52d8e9e1c5693a86e57690959c182dc40005af3
 SHA512:
-  metadata.gz: 6fe991afffcec28225b53932a1977c6c30ee6f8a79a0256380a552f25ca6d0bffd3b21452d8177529d97aac9f880e1296072804942c0b99a379ecfeb6c8ca446
-  data.tar.gz: b8a7625539fe9e5c0c49b0a85a3bce54c1fb46e68ed4910870aee8c6f37afb589888b3ba87a6786e4364021a831619874f796a38eea6d0e6b285f67e232b3926
+  metadata.gz: fbe0187478522d98f7fe3ff79c71b1ebc0b34e6f3dc9bdd44803fbe7cdab192458dda74a501dc03ad9a55b6433298c53f3ebadc4132da2b00790e239ae88ebe8
+  data.tar.gz: b6cfa2da751b722fc379263f6dadf82b383fc8cfdddf5e7ac2722992e577361c3ee8dbe0df97b15f781ddbb971eb8f27dda034b732a1cb5d1e9a6ec31e9bd415

data/lib/i18n/backend/base.rb

@@ -234,6 +234,7 @@ module I18n
             raise InvalidLocaleData.new(filename, e.inspect)
           end
         end
+        alias_method :load_yaml, :load_yml
 
         def translate_localization_format(locale, object, format, options)
           format.to_s.gsub(/%[aAbBpP]/) do |match|

data/lib/i18n/backend/key_value.rb

@@ -127,6 +127,7 @@ module I18n
           if subtrees?
             super
           else
+            return entry unless entry.is_a?(Hash)
             key = pluralization_key(entry, count)
             entry[key]
           end

data/lib/i18n/exceptions.rb

@@ -3,23 +3,14 @@
 require 'cgi'
 
 module I18n
-  # Handles exceptions raised in the backend. All exceptions except for
-  # MissingTranslationData exceptions are re-thrown. When a MissingTranslationData
-  # was caught the handler returns an error message string containing the key/scope.
-  # Note that the exception handler is not called when the option :throw was given.
   class ExceptionHandler
-    include Module.new {
-      def call(exception, locale, key, options)
-        case exception
-        when MissingTranslation
-          exception.message
-        when Exception
-          raise exception
-        else
-          throw :exception, exception
-        end
+    def call(exception, _locale, _key, _options)
+      if exception.is_a?(MissingTranslation)
+        exception.message
+      else
+        raise exception
       end
-    }
+    end
   end
 
   class ArgumentError < ::ArgumentError; end

data/lib/i18n/locale/fallbacks.rb

@@ -56,7 +56,7 @@ module I18n
       def initialize(*mappings)
         @map = {}
         map(mappings.pop) if mappings.last.is_a?(Hash)
-        self.defaults = mappings.empty? ? [I18n.default_locale.to_sym] : mappings
+        self.defaults = mappings.empty? ? [] : mappings
       end
 
       def defaults=(defaults)

data/lib/i18n/tests/interpolation.rb

@@ -43,7 +43,7 @@ module I18n
       end
 
       test "interpolation: it does not raise I18n::MissingInterpolationArgument for escaped variables" do
-        assert_nothing_raised(I18n::MissingInterpolationArgument) do
+        assert_nothing_raised do
           assert_equal 'Barr %{foo}', interpolate(:default => '%{bar} %%{foo}', :bar => 'Barr')
         end
       end

data/lib/i18n/version.rb

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

data/test/backend/fallbacks_test.rb

@@ -24,18 +24,10 @@ class I18nBackendFallbacksTranslateTest < I18n::TestCase
     assert_equal 'Interpolate %{value}', I18n.t(:interpolate)
   end
 
-  test "returns the :en translation for a missing :de translation" do
-    assert_equal 'Foo in :en', I18n.t(:foo, :locale => :de)
-  end
-
   test "returns the :de translation for a missing :'de-DE' translation" do
     assert_equal 'Bar in :de', I18n.t(:bar, :locale => :'de-DE')
   end
 
-  test "returns the :en translation for translation missing in both :de and :'de-De'" do
-    assert_equal 'Buz in :en', I18n.t(:buz, :locale => :'de-DE')
-  end
-
   test "returns the :de translation for a missing :'de-DE' when :default is a String" do
     assert_equal 'Bar in :de', I18n.t(:bar, :locale => :'de-DE', :default => "Default Bar")
     assert_equal "Default Bar", I18n.t(:missing_bar, :locale => :'de-DE', :default => "Default Bar")
@@ -106,6 +98,11 @@ class I18nBackendFallbacksTranslateTest < I18n::TestCase
       I18n.enforce_available_locales = false
     end
   end
+
+  test "returns fallback default given missing pluralization data" do
+    assert_equal 'default', I18n.t(:missing_bar, count: 1, default: 'default')
+    assert_equal 'default', I18n.t(:missing_bar, count: 0, default: 'default')
+  end
 end
 
 class I18nBackendFallbacksLocalizeTest < I18n::TestCase
@@ -117,18 +114,13 @@ class I18nBackendFallbacksLocalizeTest < I18n::TestCase
     super
     I18n.backend = Backend.new
     store_translations(:en, :date => { :formats => { :en => 'en' }, :day_names => %w(Sunday) })
-    store_translations(:de, :date => { :formats => { :de => 'de' } })
+    store_translations(:de, :date => { :formats => { :de => 'de' }, :day_names => %w(Sunday) })
   end
 
   test "still uses an existing format as usual" do
     assert_equal 'en', I18n.l(Date.today, :format => :en, :locale => :en)
   end
-
-  test "looks up and uses a fallback locale's format for a key missing in the given locale (1)" do
-    assert_equal 'en', I18n.l(Date.today, :format => :en, :locale => :de)
-  end
-
-  test "looks up and uses a fallback locale's format for a key missing in the given locale (2)" do
+  test "looks up and uses a fallback locale's format for a key missing in the given locale" do
     assert_equal 'de', I18n.l(Date.today, :format => :de, :locale => :'de-DE')
   end
 
@@ -137,7 +129,7 @@ class I18nBackendFallbacksLocalizeTest < I18n::TestCase
   end
 
   test "uses a fallback locale's translation for a key missing in the given locale" do
-    assert_equal 'Sunday', I18n.l(Date.new(2010, 1, 3), :format => '%A', :locale => :de)
+    assert_equal 'Sunday', I18n.l(Date.new(2010, 1, 3), :format => '%A', :locale => :'de-DE')
   end
 end
 
@@ -208,8 +200,8 @@ class I18nBackendFallbacksExistsTest < I18n::TestCase
   end
 
   test "exists? should return true given a key which is missing from the given locale and exists in a fallback locale" do
-    assert_equal true, I18n.exists?(:foo, :de)
-    assert_equal true, I18n.exists?(:foo, :'de-DE')
+    assert_equal true, I18n.exists?(:bar, :de)
+    assert_equal true, I18n.exists?(:bar, :'de-DE')
   end
 
   test "exists? should return false given a key which is missing from the given locale and all its fallback locales" do

data/test/backend/key_value_test.rb

@@ -58,4 +58,28 @@ class I18nBackendKeyValueTest < I18n::TestCase
     store_translations(:en, :bar => { :one => "One" })
     assert_equal("One", I18n.t("bar", :count => 1))
   end
+  
+  test "subtrees enabled: returns localized string given missing pluralization data" do
+    setup_backend!(true)
+    assert_equal 'bar', I18n.t("foo.bar", count: 1)
+  end
+
+  test "subtrees disabled: returns localized string given missing pluralization data" do
+    setup_backend!(false)
+    assert_equal 'bar', I18n.t("foo.bar", count: 1)
+  end
+  
+  test "subtrees enabled: Returns fallback default given missing pluralization data" do
+    setup_backend!(true)
+    I18n.backend.extend I18n::Backend::Fallbacks
+    assert_equal 'default', I18n.t(:missing_bar, count: 1, default: 'default')
+    assert_equal 'default', I18n.t(:missing_bar, count: 0, default: 'default')
+  end
+
+  test "subtrees disabled: Returns fallback default given missing pluralization data" do
+    setup_backend!(false)
+    I18n.backend.extend I18n::Backend::Fallbacks
+    assert_equal 'default', I18n.t(:missing_bar, count: 1, default: 'default')
+    assert_equal 'default', I18n.t(:missing_bar, count: 0, default: 'default')
+  end
 end if I18n::TestCase.key_value?

data/test/backend/simple_test.rb

@@ -17,6 +17,10 @@ class I18nBackendSimpleTest < I18n::TestCase
     assert_raise(I18n::UnknownFileType) { I18n.backend.load_translations("#{locales_dir}/en.xml") }
   end
 
+  test "simple load_translations: given a YAML file name with yaml extension does not raise anything" do
+    assert_nothing_raised { I18n.backend.load_translations("#{locales_dir}/en.yaml") }
+  end
+
   test "simple load_translations: given a Ruby file name it does not raise anything" do
     assert_nothing_raised { I18n.backend.load_translations("#{locales_dir}/en.rb") }
   end
@@ -100,4 +104,8 @@ class I18nBackendSimpleTest < I18n::TestCase
     I18n.backend.reload!
     assert_equal false, I18n.backend.initialized?
   end
+
+  test "returns localized string given missing pluralization data" do
+    assert_equal 'baz', I18n.t('foo.bar', count: 1)
+  end
 end

data/test/locale/fallbacks_test.rb

@@ -3,10 +3,10 @@ require 'test_helper'
 include I18n::Locale
 
 class I18nFallbacksDefaultsTest < I18n::TestCase
-  test "defaults reflect the I18n.default_locale if no default has been set manually" do
+  test "defaults to an empty array if no default has been set manually" do
     I18n.default_locale = :'en-US'
     fallbacks = Fallbacks.new
-    assert_equal [:'en-US', :en], fallbacks.defaults
+    assert_equal [], fallbacks.defaults
   end
 
   test "defaults reflect a manually passed default locale if any" do

data/test/test_data/locales/en.yaml

@@ -0,0 +1,3 @@
+en:
+  foo:
+    bar: baz

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: i18n
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Sven Fuchs
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-18 00:00:00.000000000 Z
+date: 2018-08-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -126,6 +126,7 @@ files:
 - test/run_all.rb
 - test/test_data/locales/de.po
 - test/test_data/locales/en.rb
+- test/test_data/locales/en.yaml
 - test/test_data/locales/en.yml
 - test/test_data/locales/invalid/empty.yml
 - test/test_data/locales/invalid/syntax.yml
@@ -151,7 +152,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.5
 requirements: []
 rubyforge_project: "[none]"
-rubygems_version: 2.7.4
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: New wave Internationalization support for Ruby