i18n 0.8.0 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9b6433e5959dd59f7cbc749fe2cf4ab553282d59
-  data.tar.gz: 56e4232a2598aacbfde0803866c8dbf0f7b65715
+  metadata.gz: 233c2489c16a63d11d29c05a13517dd6674e52ce
+  data.tar.gz: b55ebffc18d9e3c9f75a54175858031e8f57d8d6
 SHA512:
-  metadata.gz: 9f853f9dbcaf818c62134260296b9daad5885c5e68c5cacf87e13d5526d41ab982ff5387c9037d988b97bfec87b5854666088683157979af7dabcbf21f7e9714
-  data.tar.gz: 2baa498d60d117129803c04336c7f1bc77d11a497890d2e68035bfe080d5b8827b52d7f04973339e90d9fc80e8025ae480b8e5f32f111465e523c551dffcee63
+  metadata.gz: 8ed5bf64190812f81bfb29e9ce40608cdeb1330041c7d1bc02702189b88cb2e840506c977ae39713022acbcf850580f826c80e2f1492eae8194df860e492919c
+  data.tar.gz: 618f79c6b7469abd1cb0c92c100974073e13f4e16b2a429213b880383122cc9d5ecd461f5398a19693d63bf4fbb095e31e1ee8f97074c8e4ed394e6227d64a0b

data/lib/i18n/backend/fallbacks.rb

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

data/lib/i18n/backend/transliterator.rb

@@ -75,7 +75,8 @@ module I18n
           add rule if rule
         end
 
-        def transliterate(string, replacement = DEFAULT_REPLACEMENT_CHAR)
+        def transliterate(string, replacement = nil)
+          replacement ||= DEFAULT_REPLACEMENT_CHAR
           string.gsub(/[^\x00-\x7f]/u) do |char|
             approximations[char] || replacement
           end

data/lib/i18n/tests/basics.rb

@@ -37,8 +37,9 @@ module I18n
       end
 
       test "available_locales delegates to the backend when not set explicitely" do
-        I18n.backend.expects(:available_locales).twice
-        assert_equal I18n.available_locales, I18n.available_locales
+        original_available_locales_value = I18n.backend.available_locales
+        I18n.backend.expects(:available_locales).returns(original_available_locales_value).twice
+        assert_equal I18n.backend.available_locales, I18n.available_locales
       end
 
       test "exists? is implemented by the backend" do

data/lib/i18n/tests/defaults.rb

@@ -29,7 +29,7 @@ module I18n
       end
 
       test "defaults: given nil it returns nil" do
-        assert_equal nil, I18n.t(:does_not_exist, :default => nil)
+        assert_nil I18n.t(:does_not_exist, :default => nil)
       end
 
       test "defaults: given an array of missing keys it raises a MissingTranslationData exception" do

data/lib/i18n/version.rb

@@ -1,3 +1,3 @@
 module I18n
-  VERSION = "0.8.0"
+  VERSION = "0.8.1"
 end

data/test/backend/fallbacks_test.rb

@@ -68,6 +68,14 @@ class I18nBackendFallbacksTranslateTest < I18n::TestCase
     assert_equal 'Default 6 Bars', I18n.t(:missing_foo, :locale => :'de-DE', :default => [:missing_bar, {:other => "Default %{count} Bars"}, "Default Bar"], :count => 6)
   end
 
+  test "returns the default translation for a missing :de translation even when default is a String when fallback is disabled" do
+    assert_equal 'Default String', I18n.t(:foo, :locale => :de, :default => 'Default String', :fallback => false)
+  end
+
+  test "raises I18n::MissingTranslationData exception when fallback is disabled even when fallback translation exists" do
+    assert_raise(I18n::MissingTranslationData) { I18n.t(:foo, :locale => :de, :fallback => false, :raise => true) }
+  end
+
   test "raises I18n::MissingTranslationData exception when no translation was found" do
     assert_raise(I18n::MissingTranslationData) { I18n.t(:faa, :locale => :en, :raise => true) }
     assert_raise(I18n::MissingTranslationData) { I18n.t(:faa, :locale => :de, :raise => true) }
@@ -195,4 +203,4 @@ class I18nBackendFallbacksExistsTest < I18n::TestCase
     assert_equal false, I18n.exists?(:baz, :de)
     assert_equal false, I18n.exists?(:bogus, :'de-DE')
   end
-end
+end

data/test/i18n_test.rb

@@ -270,7 +270,7 @@ class I18nTest < I18n::TestCase
   end
 
   test "localize given nil and default returns default" do
-    assert_equal nil, I18n.l(nil, :default => nil)
+    assert_nil I18n.l(nil, :default => nil)
   end
 
   test "localize given an Object raises an I18n::ArgumentError" do
@@ -351,6 +351,10 @@ class I18nTest < I18n::TestCase
     end
   end
 
+  test "transliterate non-ASCII chars not in map with default replacement char" do
+    assert_equal "???", I18n.transliterate("日本語")
+  end
+
   test "I18n.locale_available? returns true when the passed locale is available" do
     I18n.available_locales = [:en, :de]
     assert_equal true, I18n.locale_available?(:de)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: i18n
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.8.1
 platform: ruby
 authors:
 - Sven Fuchs
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-31 00:00:00.000000000 Z
+date: 2017-02-22 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.0.beta1)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    activesupport (3.2.21)
-      i18n (~> 0.6, >= 0.6.4)
-      multi_json (~> 1.0)
-    metaclass (0.0.4)
-    minitest (5.9.1)
-    mocha (1.1.0)
-      metaclass (~> 0.0.1)
-    multi_json (1.11.0)
-    rake (10.4.2)
-    test_declarative (0.0.5)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  activesupport (~> 3.2.0)
-  i18n!
-  minitest
-  mocha
-  rake
-  test_declarative
-
-BUNDLED WITH
-   1.13.7

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

@@ -1,37 +0,0 @@
-PATH
-  remote: ..
-  specs:
-    i18n (0.8.0.beta1)
-
-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.1.0)
-      metaclass (~> 0.0.1)
-    multi_json (1.11.0)
-    rake (10.4.2)
-    test_declarative (0.0.5)
-    thread_safe (0.3.5)
-    tzinfo (0.3.43)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  activesupport (~> 4.0.0)
-  i18n!
-  minitest
-  mocha
-  rake
-  test_declarative
-
-BUNDLED WITH
-   1.13.7

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

@@ -1,38 +0,0 @@
-PATH
-  remote: ..
-  specs:
-    i18n (0.8.0.beta1)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    activesupport (4.1.10)
-      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.2)
-    metaclass (0.0.4)
-    minitest (5.5.1)
-    mocha (1.1.0)
-      metaclass (~> 0.0.1)
-    rake (10.4.2)
-    test_declarative (0.0.5)
-    thread_safe (0.3.5)
-    tzinfo (1.2.2)
-      thread_safe (~> 0.1)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  activesupport (~> 4.1.0)
-  i18n!
-  minitest
-  mocha
-  rake
-  test_declarative
-
-BUNDLED WITH
-   1.13.7

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

@@ -1,38 +0,0 @@
-PATH
-  remote: ..
-  specs:
-    i18n (0.8.0.beta1)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    activesupport (4.2.1)
-      i18n (~> 0.7)
-      json (~> 1.7, >= 1.7.7)
-      minitest (~> 5.1)
-      thread_safe (~> 0.3, >= 0.3.4)
-      tzinfo (~> 1.1)
-    json (1.8.2)
-    metaclass (0.0.4)
-    minitest (5.5.1)
-    mocha (1.1.0)
-      metaclass (~> 0.0.1)
-    rake (10.4.2)
-    test_declarative (0.0.5)
-    thread_safe (0.3.5)
-    tzinfo (1.2.2)
-      thread_safe (~> 0.1)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  activesupport (~> 4.2.0)
-  i18n!
-  minitest
-  mocha
-  rake
-  test_declarative
-
-BUNDLED WITH
-   1.13.7

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

@@ -1,37 +0,0 @@
-PATH
-  remote: ..
-  specs:
-    i18n (0.8.0.beta1)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    activesupport (5.0.0.1)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (~> 0.7)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-    concurrent-ruby (1.0.2)
-    metaclass (0.0.4)
-    minitest (5.9.1)
-    mocha (1.2.1)
-      metaclass (~> 0.0.1)
-    rake (11.3.0)
-    test_declarative (0.0.5)
-    thread_safe (0.3.5)
-    tzinfo (1.2.2)
-      thread_safe (~> 0.1)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  activesupport (~> 5.0.0)
-  i18n!
-  minitest
-  mocha
-  rake
-  test_declarative
-
-BUNDLED WITH
-   1.13.7

data/gemfiles/Gemfile.rails-master.lock

@@ -1,43 +0,0 @@
-GIT
-  remote: git://github.com/rails/rails.git
-  revision: da23e125f8d755917b08f5cca1f7fe1ff38c8b7e
-  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.0.beta1)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    concurrent-ruby (1.0.2)
-    metaclass (0.0.4)
-    minitest (5.5.1)
-    mocha (1.1.0)
-      metaclass (~> 0.0.1)
-    rake (10.4.2)
-    test_declarative (0.0.5)
-    thread_safe (0.3.5)
-    tzinfo (1.2.2)
-      thread_safe (~> 0.1)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  activesupport!
-  i18n!
-  minitest
-  mocha
-  rake
-  test_declarative
-
-BUNDLED WITH
-   1.13.7