i18n 0.6.9 → 0.6.11

data/lib/i18n/core_ext/kernel/suppress_warnings.rb

@@ -0,0 +1,8 @@
+module Kernel
+  def suppress_warnings
+    original_verbosity, $VERBOSE = $VERBOSE, nil
+    yield
+  ensure
+    $VERBOSE = original_verbosity
+  end
+end

data/lib/i18n/exceptions.rb

@@ -13,7 +13,7 @@ module I18n
           # TODO: this block is to be replaced by `exception.message` when
           # rescue_format is removed
           if options[:rescue_format] == :html
-            if @rescue_format_deprecation
+            if !defined?(@rescue_format_deprecation)
               $stderr.puts "[DEPRECATED] I18n's :recue_format option will be removed from a future release. All exception messages will be plain text. If you need the exception handler to return an html format please set or pass a custom exception handler."
               @rescue_format_deprecation = true
             end

data/lib/i18n/version.rb

@@ -1,3 +1,3 @@
 module I18n
-  VERSION = "0.6.9"
+  VERSION = "0.6.11"
 end

data/test/api/all_features_test.rb

@@ -7,7 +7,7 @@ rescue LoadError
   puts "not testing with Cache enabled because active_support can not be found"
 end
 
-class I18nAllFeaturesApiTest < Test::Unit::TestCase
+class I18nAllFeaturesApiTest < I18n::TestCase
   class Backend < I18n::Backend::Simple
     include I18n::Backend::Metadata
     include I18n::Backend::Cache

data/test/api/cascade_test.rb

@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class I18nCascadeApiTest < Test::Unit::TestCase
+class I18nCascadeApiTest < I18n::TestCase
   class Backend < I18n::Backend::Simple
     include I18n::Backend::Cascade
   end

data/test/api/chain_test.rb

@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class I18nApiChainTest < Test::Unit::TestCase
+class I18nApiChainTest < I18n::TestCase
   def setup
     super
     I18n.backend = I18n::Backend::Chain.new(I18n::Backend::Simple.new, I18n.backend)

data/test/api/fallbacks_test.rb

@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class I18nFallbacksApiTest < Test::Unit::TestCase
+class I18nFallbacksApiTest < I18n::TestCase
   class Backend < I18n::Backend::Simple
     include I18n::Backend::Fallbacks
   end

data/test/api/key_value_test.rb

@@ -1,8 +1,8 @@
 require 'test_helper'
 
-I18n::Tests.setup_rufus_tokyo
+I18n::TestCase.setup_rufus_tokyo
 
-class I18nKeyValueApiTest < Test::Unit::TestCase
+class I18nKeyValueApiTest < I18n::TestCase
   include I18n::Tests::Basics
   include I18n::Tests::Defaults
   include I18n::Tests::Interpolation

data/test/api/memoize_test.rb

@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class I18nMemoizeBackendWithSimpleApiTest < Test::Unit::TestCase
+class I18nMemoizeBackendWithSimpleApiTest < I18n::TestCase
   include I18n::Tests::Basics
   include I18n::Tests::Defaults
   include I18n::Tests::Interpolation
@@ -27,9 +27,9 @@ class I18nMemoizeBackendWithSimpleApiTest < Test::Unit::TestCase
   end
 end
 
-I18n::Tests.setup_rufus_tokyo
+I18n::TestCase.setup_rufus_tokyo
 
-class I18nMemoizeBackendWithKeyValueApiTest < Test::Unit::TestCase
+class I18nMemoizeBackendWithKeyValueApiTest < I18n::TestCase
   include I18n::Tests::Basics
   include I18n::Tests::Defaults
   include I18n::Tests::Interpolation

data/test/api/override_test.rb

@@ -1,22 +1,18 @@
 require 'test_helper'
 
-class I18nOverrideTest < Test::Unit::TestCase
+class I18nOverrideTest < I18n::TestCase
   module OverrideInverse
-
     def translate(*args)
       super(*args).reverse
     end
     alias :t :translate
-
   end
 
   module OverrideSignature
-
     def translate(*args)
       args.first + args[1]
     end
     alias :t :translate
-
   end
 
   def setup
@@ -44,5 +40,4 @@ class I18nOverrideTest < Test::Unit::TestCase
     @I18n.extend OverrideSignature
     assert_equal 'HelloWelcome message on home page', @I18n.translate('Hello', 'Welcome message on home page', :tokenize => true) # tr8n example
   end
-
 end

data/test/api/pluralization_test.rb

@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class I18nPluralizationApiTest < Test::Unit::TestCase
+class I18nPluralizationApiTest < I18n::TestCase
   class Backend < I18n::Backend::Simple
     include I18n::Backend::Pluralization
   end

data/test/api/simple_test.rb

@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class I18nSimpleBackendApiTest < Test::Unit::TestCase
+class I18nSimpleBackendApiTest < I18n::TestCase
   class Backend < I18n::Backend::Simple
     include I18n::Backend::Pluralization
   end

data/test/backend/cache_test.rb

@@ -6,7 +6,7 @@ rescue LoadError
   $stderr.puts "Skipping cache tests using ActiveSupport"
 else
 
-class I18nBackendCacheTest < Test::Unit::TestCase
+class I18nBackendCacheTest < I18n::TestCase
   class Backend < I18n::Backend::Simple
     include I18n::Backend::Cache
   end

data/test/backend/cascade_test.rb

@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class I18nBackendCascadeTest < Test::Unit::TestCase
+class I18nBackendCascadeTest < I18n::TestCase
   class Backend < I18n::Backend::Simple
     include I18n::Backend::Cascade
   end

data/test/backend/chain_test.rb

@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class I18nBackendChainTest < Test::Unit::TestCase
+class I18nBackendChainTest < I18n::TestCase
   def setup
     @first  = backend(:en => {
       :foo => 'Foo', :formats => { :short => 'short' }, :plural_1 => { :one => '%{count}' }, :dates => {:a => "A"}

data/test/backend/exceptions_test.rb

@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class I18nBackendExceptionsTest < Test::Unit::TestCase
+class I18nBackendExceptionsTest < I18n::TestCase
   def setup
     I18n.backend = I18n::Backend::Simple.new
   end

data/test/backend/fallbacks_test.rb

@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class I18nBackendFallbacksTranslateTest < Test::Unit::TestCase
+class I18nBackendFallbacksTranslateTest < I18n::TestCase
   class Backend < I18n::Backend::Simple
     include I18n::Backend::Fallbacks
   end
@@ -10,6 +10,7 @@ class I18nBackendFallbacksTranslateTest < Test::Unit::TestCase
     store_translations(:en, :foo => 'Foo in :en', :bar => 'Bar in :en', :buz => 'Buz in :en')
     store_translations(:de, :bar => 'Bar in :de', :baz => 'Baz in :de')
     store_translations(:'de-DE', :baz => 'Baz in :de-DE')
+    store_translations(:'pt-BR', :baz => 'Baz in :pt-BR')
   end
 
   test "still returns an existing translation as usual" do
@@ -74,9 +75,18 @@ class I18nBackendFallbacksTranslateTest < Test::Unit::TestCase
   test "should ensure that default is not splitted on new line char" do
     assert_equal "Default \n Bar", I18n.t(:missing_bar, :default => "Default \n Bar")
   end
+
+  test "should not raise error when enforce_available_locales is true, :'pt' is missing and default is a Symbol" do
+    I18n.enforce_available_locales = true
+    begin
+      assert_equal 'Foo', I18n.t(:'model.attrs.foo', :locale => :'pt-BR', :default => [:'attrs.foo', "Foo"])
+    ensure
+      I18n.enforce_available_locales = false
+    end
+  end
 end
 
-class I18nBackendFallbacksLocalizeTest < Test::Unit::TestCase
+class I18nBackendFallbacksLocalizeTest < I18n::TestCase
   class Backend < I18n::Backend::Simple
     include I18n::Backend::Fallbacks
   end
@@ -108,7 +118,7 @@ class I18nBackendFallbacksLocalizeTest < Test::Unit::TestCase
   end
 end
 
-class I18nBackendFallbacksWithChainTest < Test::Unit::TestCase
+class I18nBackendFallbacksWithChainTest < I18n::TestCase
   class Backend < I18n::Backend::Simple
     include I18n::Backend::Fallbacks
   end
@@ -116,10 +126,21 @@ class I18nBackendFallbacksWithChainTest < Test::Unit::TestCase
   def setup
     backend = Backend.new
     backend.store_translations(:de, :foo => 'FOO')
+    backend.store_translations(:'pt-BR', :foo => 'Baz in :pt-BR')
     I18n.backend = I18n::Backend::Chain.new(I18n::Backend::Simple.new, backend)
+    I18n.backend.class.send(:include, I18n::Backend::Fallbacks)
   end
 
   test "falls back from de-DE to de when there is no translation for de-DE available" do
     assert_equal 'FOO', I18n.t(:foo, :locale => :'de-DE')
   end
+
+  test "should not raise error when enforce_available_locales is true, :'pt' is missing and default is a Symbol" do
+    I18n.enforce_available_locales = true
+    begin
+      assert_equal 'Foo', I18n.t(:'model.attrs.foo', :locale => :'pt-BR', :default => [:'attrs.foo', "Foo"])
+    ensure
+      I18n.enforce_available_locales = false
+    end
+  end
 end

data/test/backend/interpolation_compiler_test.rb

@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class InterpolationCompilerTest < Test::Unit::TestCase
+class InterpolationCompilerTest < I18n::TestCase
   Compiler = I18n::Backend::InterpolationCompiler::Compiler
 
   def compile_and_interpolate(str, values = {})
@@ -95,18 +95,18 @@ class InterpolationCompilerTest < Test::Unit::TestCase
   end
 end
 
-class I18nBackendInterpolationCompilerTest < Test::Unit::TestCase
+class I18nBackendInterpolationCompilerTest < I18n::TestCase
   class Backend < I18n::Backend::Simple
     include I18n::Backend::InterpolationCompiler
   end
-  
+
   include I18n::Tests::Interpolation
 
   def setup
     I18n.backend = Backend.new
     super
   end
-  
+
   # pre-compile default strings to make sure we are testing I18n::Backend::InterpolationCompiler
   def interpolate(*args)
     options = args.last.kind_of?(Hash) ? args.last : {}
@@ -115,5 +115,4 @@ class I18nBackendInterpolationCompilerTest < Test::Unit::TestCase
     end
     super
   end
-
 end

data/test/backend/key_value_test.rb

@@ -1,8 +1,8 @@
 require 'test_helper'
 
-I18n::Tests.setup_rufus_tokyo
+I18n::TestCase.setup_rufus_tokyo
 
-class I18nBackendKeyValueTest < Test::Unit::TestCase
+class I18nBackendKeyValueTest < I18n::TestCase
   def setup_backend!(subtree=true)
     I18n.backend = I18n::Backend::KeyValue.new(Rufus::Tokyo::Cabinet.new('*'), subtree)
     store_translations(:en, :foo => { :bar => 'bar', :baz => 'baz' })

data/test/backend/metadata_test.rb

@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class I18nBackendMetadataTest < Test::Unit::TestCase
+class I18nBackendMetadataTest < I18n::TestCase
   class Backend < I18n::Backend::Simple
     include I18n::Backend::Metadata
   end

data/test/backend/pluralization_test.rb

@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class I18nBackendPluralizationTest < Test::Unit::TestCase
+class I18nBackendPluralizationTest < I18n::TestCase
   class Backend < I18n::Backend::Simple
     include I18n::Backend::Pluralization
     include I18n::Backend::Fallbacks

data/test/backend/simple_test.rb

@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class I18nBackendSimpleTest < Test::Unit::TestCase
+class I18nBackendSimpleTest < I18n::TestCase
   def setup
     I18n.backend = I18n::Backend::Simple.new
     I18n.load_path = [locales_dir + '/en.yml']
@@ -49,23 +49,23 @@ class I18nBackendSimpleTest < Test::Unit::TestCase
   # storing translations
 
   test "simple store_translations: stores translations, ... no, really :-)" do
-    I18n.backend.store_translations :'en', :foo => 'bar'
+    store_translations :'en', :foo => 'bar'
     assert_equal Hash[:'en', {:foo => 'bar'}], translations
   end
 
   test "simple store_translations: deep_merges with existing translations" do
-    I18n.backend.store_translations :'en', :foo => {:bar => 'bar'}
-    I18n.backend.store_translations :'en', :foo => {:baz => 'baz'}
+    store_translations :'en', :foo => {:bar => 'bar'}
+    store_translations :'en', :foo => {:baz => 'baz'}
     assert_equal Hash[:'en', {:foo => {:bar => 'bar', :baz => 'baz'}}], translations
   end
 
   test "simple store_translations: converts the given locale to a Symbol" do
-    I18n.backend.store_translations 'en', :foo => 'bar'
+    store_translations 'en', :foo => 'bar'
     assert_equal Hash[:'en', {:foo => 'bar'}], translations
   end
 
   test "simple store_translations: converts keys to Symbols" do
-    I18n.backend.store_translations 'en', 'foo' => {'bar' => 'bar', 'baz' => 'baz'}
+    store_translations 'en', 'foo' => {'bar' => 'bar', 'baz' => 'baz'}
     assert_equal Hash[:'en', {:foo => {:bar => 'bar', :baz => 'baz'}}], translations
   end
 

data/test/backend/transliterator_test.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 require 'test_helper'
 
-class I18nBackendTransliterator < Test::Unit::TestCase
+class I18nBackendTransliterator < I18n::TestCase
   def setup
     I18n.backend = I18n::Backend::Simple.new
     @proc = lambda { |n| n.upcase }

data/test/core_ext/hash_test.rb

@@ -1,7 +1,7 @@
 require 'test_helper'
 require 'i18n/core_ext/hash'
 
-class I18nCoreExtHashInterpolationTest < Test::Unit::TestCase
+class I18nCoreExtHashInterpolationTest < I18n::TestCase
   test "#deep_symbolize_keys" do
     hash = { 'foo' => { 'bar' => { 'baz' => 'bar' } } }
     expected = { :foo => { :bar => { :baz => 'bar' } } }

data/test/core_ext/string/interpolate_test.rb

@@ -5,7 +5,7 @@ require 'test_helper'
 # some tests taken from Masao's tests
 # http://github.com/mutoh/gettext/blob/edbbe1fa8238fa12c7f26f2418403015f0270e47/test/test_string.rb
 
-class I18nCoreExtStringInterpolationTest < Test::Unit::TestCase
+class I18nCoreExtStringInterpolationTest < I18n::TestCase
   test "String interpolates a single argument" do
     assert_equal "Masao", "%s" % "Masao"
   end

data/test/gettext/api_test.rb

@@ -4,7 +4,7 @@ require 'i18n/gettext/helpers'
 
 include I18n::Gettext::Helpers
 
-class I18nGettextApiTest < Test::Unit::TestCase
+class I18nGettextApiTest < I18n::TestCase
   def setup
     I18n.locale = :en
     I18n.backend.store_translations :de, {

data/test/gettext/backend_test.rb

@@ -5,7 +5,7 @@ require 'test_helper'
 # apparently Ruby 1.9.1p129 has encoding problems with the gettext po parser
 unless RUBY_VERSION == '1.9.1' && RUBY_PATCHLEVEL <= 129
 
-  class I18nGettextBackendTest < Test::Unit::TestCase
+  class I18nGettextBackendTest < I18n::TestCase
     include I18n::Gettext::Helpers
 
     class Backend < I18n::Backend::Simple

data/test/i18n/exceptions_test.rb

@@ -1,9 +1,9 @@
 require 'test_helper'
 
-class I18nExceptionsTest < Test::Unit::TestCase
+class I18nExceptionsTest < I18n::TestCase
   def test_invalid_locale_stores_locale
     force_invalid_locale
-  rescue I18n::ArgumentError => e
+  rescue I18n::ArgumentError => exception
     assert_nil exception.locale
   end
 
@@ -91,28 +91,28 @@ class I18nExceptionsTest < Test::Unit::TestCase
     end
 
     def force_missing_translation_data(options = {})
-      I18n.backend.store_translations('de', :bar => nil)
+      store_translations('de', :bar => nil)
       I18n.translate(:foo, options.merge(:scope => :bar, :locale => :de))
     rescue I18n::ArgumentError => e
       block_given? ? yield(e) : raise(e)
     end
 
     def force_invalid_pluralization_data
-      I18n.backend.store_translations('de', :foo => [:bar])
+      store_translations('de', :foo => [:bar])
       I18n.translate(:foo, :count => 1, :locale => :de)
     rescue I18n::ArgumentError => e
       block_given? ? yield(e) : raise(e)
     end
 
     def force_missing_interpolation_argument
-      I18n.backend.store_translations('de', :foo => "%{bar}")
+      store_translations('de', :foo => "%{bar}")
       I18n.translate(:foo, :baz => 'baz', :locale => :de)
     rescue I18n::ArgumentError => e
       block_given? ? yield(e) : raise(e)
     end
 
     def force_reserved_interpolation_key
-      I18n.backend.store_translations('de', :foo => "%{scope}")
+      store_translations('de', :foo => "%{scope}")
       I18n.translate(:foo, :baz => 'baz', :locale => :de)
     rescue I18n::ArgumentError => e
       block_given? ? yield(e) : raise(e)

data/test/i18n/interpolate_test.rb

@@ -4,7 +4,7 @@ require 'i18n/core_ext/string/interpolate'
 # thanks to Masao's String extensions, some tests taken from Masao's tests
 # http://github.com/mutoh/gettext/blob/edbbe1fa8238fa12c7f26f2418403015f0270e47/test/test_string.rb
 
-class I18nInterpolateTest < Test::Unit::TestCase
+class I18nInterpolateTest < I18n::TestCase
   test "String interpolates a hash argument w/ named placeholders" do
     assert_equal "Masao Mutoh", I18n.interpolate("%{first} %{last}", :first => 'Masao', :last => 'Mutoh' )
   end
@@ -60,7 +60,7 @@ class I18nInterpolateTest < Test::Unit::TestCase
   end
 end
 
-class I18nMissingInterpolationCustomHandlerTest < Test::Unit::TestCase
+class I18nMissingInterpolationCustomHandlerTest < I18n::TestCase
   def setup
     @old_handler = I18n.config.missing_interpolation_argument_handler
     I18n.config.missing_interpolation_argument_handler = lambda do |key, values, string|