i18n 0.8.4 → 0.8.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7aea28fdffb1b83ffc558cca097cb9ddd692a5e5
-  data.tar.gz: 1143c46c544e1ca82f014f6995df8170f13d896d
+  metadata.gz: 29ba3d47b7f95d69e05c3ec152dedd933953a2c7
+  data.tar.gz: fd45bb60da662e967b26000f6e91905cb79f3a6b
 SHA512:
-  metadata.gz: 835ea057465196d791bba7a9d1affdf4d80e6ef4321fc08ff704571106d112eb3387cc757c8be8e115d9ffcfff808f38b9d05740ce68b63c873a7bbe4eb21646
-  data.tar.gz: 4ccba735b7f85e8b755d8f9308c36d2c31d6aabb7051a162c917997e47cfd016b3ffddda27de5a4262165c6cb602be45f0e32c30686b8ee5f067f387faf36056
+  metadata.gz: 5e087614ea6735a65e689f90ea7ad4689fe61f8daff455687c3dcb5b4d778b78afe1f674602018681c1ac0ca36470c03fba9663166ed03694504ba8bad154fcb
+  data.tar.gz: 1499ab0e51622e8663db528cc7a18718175a965c655302a34bdfc48e16137535c3b959b1f79a73b129211a2ff8f5c0948b8c72a7486c94806b6f08402554b84a

data/lib/i18n/backend/base.rb

@@ -136,14 +136,14 @@ module I18n
         # - It will pick the :other subkey otherwise.
         # - It will pick the :zero subkey in the special case where count is
         #   equal to 0 and there is a :zero subkey present. This behaviour is
-        #   not stand with regards to the CLDR pluralization rules.
+        #   not standard with regards to the CLDR pluralization rules.
         # Other backends can implement more flexible or complex pluralization rules.
         def pluralize(locale, entry, count)
           return entry unless entry.is_a?(Hash) && count
 
           key = :zero if count == 0 && entry.has_key?(:zero)
           key ||= count == 1 ? :one : :other
-          raise InvalidPluralizationData.new(entry, count) unless entry.has_key?(key)
+          raise InvalidPluralizationData.new(entry, count, key) unless entry.has_key?(key)
           entry[key]
         end
 

data/lib/i18n/backend/fallbacks.rb

@@ -36,11 +36,11 @@ module I18n
       # it is evaluated last after all the fallback locales have been tried.
       def translate(locale, key, options = {})
         return super unless options.fetch(:fallback, true)
-        return super if (@fallback_locked ||= false)
+        return super if options[:fallback_in_progress]
         default = extract_non_symbol_default!(options) if options[:default]
 
         begin
-          @fallback_locked = true
+          options[:fallback_in_progress] = true
           I18n.fallbacks[locale].each do |fallback|
             begin
               catch(:exception) do
@@ -52,7 +52,7 @@ module I18n
             end
           end
         ensure
-          @fallback_locked = false
+          options.delete(:fallback_in_progress)
         end
 
         return super(locale, nil, options.merge(:default => default)) if default

data/lib/i18n/backend/pluralization.rb

@@ -32,7 +32,7 @@ module I18n
         pluralizer = pluralizer(locale)
         if pluralizer.respond_to?(:call)
           key = count == 0 && entry.has_key?(:zero) ? :zero : pluralizer.call(count)
-          raise InvalidPluralizationData.new(entry, count) unless entry.has_key?(key)
+          raise InvalidPluralizationData.new(entry, count, key) unless entry.has_key?(key)
           entry[key]
         else
           super

data/lib/i18n/exceptions.rb

@@ -71,10 +71,10 @@ module I18n
   end
 
   class InvalidPluralizationData < ArgumentError
-    attr_reader :entry, :count
-    def initialize(entry, count)
-      @entry, @count = entry, count
-      super "translation data #{entry.inspect} can not be used with :count => #{count}"
+    attr_reader :entry, :count, :key
+    def initialize(entry, count, key)
+      @entry, @count, @key = entry, count, key
+      super "translation data #{entry.inspect} can not be used with :count => #{count}. key '#{key}' is missing."
     end
   end
 

data/lib/i18n/tests/localization/procs.rb

@@ -72,7 +72,7 @@ module I18n
               when ::Date
                 arg.strftime('%a, %d %b %Y')
               when Hash
-                arg.delete(:fallback)
+                arg.delete(:fallback_in_progress)
                 arg.inspect
               else
                 arg.inspect

data/lib/i18n/tests/procs.rb

@@ -48,7 +48,7 @@ module I18n
 
 
       def self.filter_args(*args)
-        args.map {|arg| arg.delete(:fallback) if arg.is_a?(Hash) ; arg }.inspect
+        args.map {|arg| arg.delete(:fallback_in_progress) if arg.is_a?(Hash) ; arg }.inspect
       end
     end
   end

data/lib/i18n/version.rb

@@ -1,3 +1,3 @@
 module I18n
-  VERSION = "0.8.4"
+  VERSION = "0.8.5"
 end

data/test/i18n/exceptions_test.rb

@@ -32,16 +32,19 @@ class I18nExceptionsTest < I18n::TestCase
     end
   end
 
-  test "InvalidPluralizationData stores entry and count" do
+  test "InvalidPluralizationData stores entry, count and key" do
     force_invalid_pluralization_data do |exception|
-      assert_equal [:bar], exception.entry
+      assert_equal({:other => "bar"}, exception.entry)
       assert_equal 1, exception.count
+      assert_equal :one, exception.key
     end
   end
 
-  test "InvalidPluralizationData message contains count and data" do
+  test "InvalidPluralizationData message contains count, data and missing key" do
     force_invalid_pluralization_data do |exception|
-      assert_equal 'translation data [:bar] can not be used with :count => 1', exception.message
+      assert_match '1', exception.message
+      assert_match '{:other=>"bar"}', exception.message
+      assert_match 'one', exception.message
     end
   end
 
@@ -71,7 +74,7 @@ class I18nExceptionsTest < I18n::TestCase
       assert_equal 'reserved key :scope used in "%{scope}"', exception.message
     end
   end
-  
+
   test "MissingTranslationData#new can be initialized with just two arguments" do
     assert I18n::MissingTranslationData.new('en', 'key')
   end
@@ -92,7 +95,7 @@ class I18nExceptionsTest < I18n::TestCase
     end
 
     def force_invalid_pluralization_data
-      store_translations('de', :foo => [:bar])
+      store_translations('de', :foo => { :other => 'bar' })
       I18n.translate(:foo, :count => 1, :locale => :de)
     rescue I18n::ArgumentError => e
       block_given? ? yield(e) : raise(e)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: i18n
 version: !ruby/object:Gem::Version
-  version: 0.8.4
+  version: 0.8.5
 platform: ruby
 authors:
 - Sven Fuchs
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-31 00:00:00.000000000 Z
+date: 2017-07-08 00:00:00.000000000 Z
 dependencies: []
 description: New wave Internationalization support for Ruby.
 email: rails-i18n@googlegroups.com
@@ -23,17 +23,11 @@ files:
 - MIT-LICENSE
 - README.md
 - gemfiles/Gemfile.rails-3.2.x
-- gemfiles/Gemfile.rails-3.2.x.lock
 - gemfiles/Gemfile.rails-4.0.x
-- gemfiles/Gemfile.rails-4.0.x.lock
 - gemfiles/Gemfile.rails-4.1.x
-- gemfiles/Gemfile.rails-4.1.x.lock
 - gemfiles/Gemfile.rails-4.2.x
-- gemfiles/Gemfile.rails-4.2.x.lock
 - gemfiles/Gemfile.rails-5.0.x
-- gemfiles/Gemfile.rails-5.0.x.lock
 - gemfiles/Gemfile.rails-master
-- gemfiles/Gemfile.rails-master.lock
 - lib/i18n.rb
 - lib/i18n/backend.rb
 - lib/i18n/backend/base.rb

data/gemfiles/Gemfile.rails-3.2.x.lock

@@ -1,32 +0,0 @@
-PATH
-  remote: ..
-  specs:
-    i18n (0.8.2)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    activesupport (3.2.22.5)
-      i18n (~> 0.6, >= 0.6.4)
-      multi_json (~> 1.0)
-    metaclass (0.0.4)
-    minitest (5.10.1)
-    mocha (1.2.1)
-      metaclass (~> 0.0.1)
-    multi_json (1.12.1)
-    rake (12.0.0)
-    test_declarative (0.0.5)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  activesupport (~> 3.2.0)
-  i18n!
-  minitest
-  mocha
-  rake
-  test_declarative
-
-BUNDLED WITH
-   1.14.6

data/gemfiles/Gemfile.rails-4.0.x.lock

@@ -1,37 +0,0 @@
-PATH
-  remote: ..
-  specs:
-    i18n (0.8.2)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    activesupport (4.0.13)
-      i18n (~> 0.6, >= 0.6.9)
-      minitest (~> 4.2)
-      multi_json (~> 1.3)
-      thread_safe (~> 0.1)
-      tzinfo (~> 0.3.37)
-    metaclass (0.0.4)
-    minitest (4.7.5)
-    mocha (1.2.1)
-      metaclass (~> 0.0.1)
-    multi_json (1.12.1)
-    rake (12.0.0)
-    test_declarative (0.0.5)
-    thread_safe (0.3.6)
-    tzinfo (0.3.53)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  activesupport (~> 4.0.0)
-  i18n!
-  minitest
-  mocha
-  rake
-  test_declarative
-
-BUNDLED WITH
-   1.14.6

data/gemfiles/Gemfile.rails-4.1.x.lock

@@ -1,38 +0,0 @@
-PATH
-  remote: ..
-  specs:
-    i18n (0.8.2)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    activesupport (4.1.16)
-      i18n (~> 0.6, >= 0.6.9)
-      json (~> 1.7, >= 1.7.7)
-      minitest (~> 5.1)
-      thread_safe (~> 0.1)
-      tzinfo (~> 1.1)
-    json (1.8.6)
-    metaclass (0.0.4)
-    minitest (5.10.1)
-    mocha (1.2.1)
-      metaclass (~> 0.0.1)
-    rake (12.0.0)
-    test_declarative (0.0.5)
-    thread_safe (0.3.6)
-    tzinfo (1.2.2)
-      thread_safe (~> 0.1)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  activesupport (~> 4.1.0)
-  i18n!
-  minitest
-  mocha
-  rake
-  test_declarative
-
-BUNDLED WITH
-   1.14.6

data/gemfiles/Gemfile.rails-4.2.x.lock

@@ -1,36 +0,0 @@
-PATH
-  remote: ..
-  specs:
-    i18n (0.8.2)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    activesupport (4.2.8)
-      i18n (~> 0.7)
-      minitest (~> 5.1)
-      thread_safe (~> 0.3, >= 0.3.4)
-      tzinfo (~> 1.1)
-    metaclass (0.0.4)
-    minitest (5.10.1)
-    mocha (1.2.1)
-      metaclass (~> 0.0.1)
-    rake (12.0.0)
-    test_declarative (0.0.5)
-    thread_safe (0.3.6)
-    tzinfo (1.2.2)
-      thread_safe (~> 0.1)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  activesupport (~> 4.2.0)
-  i18n!
-  minitest
-  mocha
-  rake
-  test_declarative
-
-BUNDLED WITH
-   1.14.6

data/gemfiles/Gemfile.rails-5.0.x.lock

@@ -1,37 +0,0 @@
-PATH
-  remote: ..
-  specs:
-    i18n (0.8.2)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    activesupport (5.0.2)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (~> 0.7)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-    concurrent-ruby (1.0.5)
-    metaclass (0.0.4)
-    minitest (5.10.1)
-    mocha (1.2.1)
-      metaclass (~> 0.0.1)
-    rake (12.0.0)
-    test_declarative (0.0.5)
-    thread_safe (0.3.6)
-    tzinfo (1.2.2)
-      thread_safe (~> 0.1)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  activesupport (~> 5.0.0)
-  i18n!
-  minitest
-  mocha
-  rake
-  test_declarative
-
-BUNDLED WITH
-   1.14.6

data/gemfiles/Gemfile.rails-master.lock

@@ -1,43 +0,0 @@
-GIT
-  remote: git://github.com/rails/rails.git
-  revision: 49aa974ec8b15721d53b3b6abea88bd6ba433a68
-  branch: master
-  specs:
-    activesupport (5.1.0.alpha)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (~> 0.7)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-
-PATH
-  remote: ..
-  specs:
-    i18n (0.8.2)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    concurrent-ruby (1.0.5)
-    metaclass (0.0.4)
-    minitest (5.10.1)
-    mocha (1.2.1)
-      metaclass (~> 0.0.1)
-    rake (12.0.0)
-    test_declarative (0.0.5)
-    thread_safe (0.3.6)
-    tzinfo (1.2.2)
-      thread_safe (~> 0.1)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  activesupport!
-  i18n!
-  minitest
-  mocha
-  rake
-  test_declarative
-
-BUNDLED WITH
-   1.14.6