i18n 0.2.1 → 0.3.0

data/test/api/lambda.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module Tests
   module Backend
     module Api
@@ -16,8 +18,8 @@ module Tests
         def test_translate_proc_with_pluralize
           setup_proc_translations
           params = { :zero => 'zero', :one => 'one', :other => 'other' }
-          assert_equal 'zero', I18n.backend.translate('en', :lambda_for_pluralize, params.merge(:count => 0))
-          assert_equal 'one', I18n.backend.translate('en', :lambda_for_pluralize, params.merge(:count => 1))
+          assert_equal 'zero',  I18n.backend.translate('en', :lambda_for_pluralize, params.merge(:count => 0))
+          assert_equal 'one',   I18n.backend.translate('en', :lambda_for_pluralize, params.merge(:count => 1))
           assert_equal 'other', I18n.backend.translate('en', :lambda_for_pluralize, params.merge(:count => 2))
         end
 
@@ -47,4 +49,4 @@ module Tests
       end
     end
   end
-end
+end

data/test/api/link.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module Tests
   module Backend
     module Api
@@ -28,7 +30,7 @@ module Tests
         end
 
         private
-  
+
           def setup_linked_translations
             I18n.backend.store_translations 'en', {
               :foo => 'foo',
@@ -42,4 +44,4 @@ module Tests
       end
     end
   end
-end
+end

data/test/api/localization/date.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module Tests
   module Backend
     module Api

data/test/api/localization/date_time.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module Tests
   module Backend
     module Api
@@ -58,4 +60,4 @@ module Tests
       end
     end
   end
-end
+end

data/test/api/localization/lambda.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module Tests
   module Backend
     module Api
@@ -12,7 +14,7 @@ module Tests
             assert_match /марта/, I18n.backend.localize('ru', time, "%d %B %Y")
             assert_match /Март/, I18n.backend.localize('ru', time, "%B %Y")
           end
-  
+
           def test_localize_uses_lambda_abbr_day_names
             assert_match /марта/, I18n.backend.localize('ru', time, "%d %b %Y")
             assert_match /март/, I18n.backend.localize('ru', time, "%b %Y")
@@ -21,4 +23,4 @@ module Tests
       end
     end
   end
-end
+end

data/test/api/localization/time.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module Tests
   module Backend
     module Api
@@ -58,4 +60,4 @@ module Tests
       end
     end
   end
-end
+end

data/test/api/pluralization.rb

@@ -1,40 +1,37 @@
+# encoding: utf-8
+
 module Tests
   module Backend
     module Api
       module Pluralization
-        def test_pluralize_given_nil_returns_the_given_entry
-          entry = {:one => 'bar', :other => 'bars'}
-          assert_equal entry, I18n.backend.send(:pluralize, nil, entry, nil)
-        end
-
         def test_pluralize_given_0_returns_zero_string_if_zero_key_given
-          assert_equal 'zero', I18n.backend.send(:pluralize, nil, {:zero => 'zero', :one => 'bar', :other => 'bars'}, 0)
+          assert_equal 'zero', I18n.t(:default => { :zero => 'zero' }, :count => 0)
         end
 
         def test_pluralize_given_0_returns_plural_string_if_no_zero_key_given
-          assert_equal 'bars', I18n.backend.send(:pluralize, nil, {:one => 'bar', :other => 'bars'}, 0)
+          assert_equal 'bars', I18n.t(:default => { :other => 'bars' }, :count => 0)
         end
 
         def test_pluralize_given_1_returns_singular_string
-          assert_equal 'bar', I18n.backend.send(:pluralize, nil, {:one => 'bar', :other => 'bars'}, 1)
+          assert_equal 'bar', I18n.t(:default => { :one => 'bar' }, :count => 1)
         end
 
         def test_pluralize_given_2_returns_plural_string
-          assert_equal 'bars', I18n.backend.send(:pluralize, nil, {:one => 'bar', :other => 'bars'}, 2)
+          assert_equal 'bars', I18n.t(:default => { :other => 'bars' }, :count => 2)
         end
 
         def test_pluralize_given_3_returns_plural_string
-          assert_equal 'bars', I18n.backend.send(:pluralize, nil, {:one => 'bar', :other => 'bars'}, 3)
+          assert_equal 'bars', I18n.t(:default => { :other => 'bars' }, :count => 3)
         end
 
-        def test_interpolate_given_incomplete_pluralization_data_raises_invalid_pluralization_data
-          assert_raises(I18n::InvalidPluralizationData){ I18n.backend.send(:pluralize, nil, {:one => 'bar'}, 2) }
+        def test_pluralize_given_nil_returns_the_given_entry
+          assert_equal({ :zero => 'zero' }, I18n.t(:default => { :zero => 'zero' }, :count => nil))
         end
 
-        def test_pluralize_given_pluralization_data_as_default
-          assert_equal 'bars', I18n.t(:bar, :count => 2, :default => { :one => 'bar', :other => 'bars' })
+        def test_interpolate_given_incomplete_pluralization_data_raises_invalid_pluralization_data
+          assert_raises(I18n::InvalidPluralizationData){ I18n.t(:default => { :one => 'bar' }, :count => 2) }
         end
       end
     end
   end
-end
+end

data/test/api/translation.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module Tests
   module Backend
     module Api
@@ -5,7 +7,7 @@ module Tests
         def translate(key, options = {})
           I18n.backend.translate('en', key, options)
         end
-        
+
         def test_given_no_keys_it_returns_the_default
           assert_equal 'default', translate(nil, :default => 'default')
         end
@@ -33,7 +35,7 @@ module Tests
         end
 
         def test_translate_with_a_missing_key_and_no_default_raises_missing_translation_data
-          assert_raises(I18n::MissingTranslationData) do 
+          assert_raises(I18n::MissingTranslationData) do
             translate(:missing)
           end
         end
@@ -46,4 +48,4 @@ module Tests
       end
     end
   end
-end
+end

data/test/backend/active_record/active_record_test.rb

@@ -0,0 +1,40 @@
+# encoding: utf-8
+require File.expand_path(File.dirname(__FILE__) + '/../../test_helper')
+require 'i18n/backend/active_record'
+
+class I18nActiveRecordBackendTest < Test::Unit::TestCase
+  include Tests::Backend::ActiveRecord::Setup::Base
+
+  def test_store_translations_does_not_allow_ambigous_keys_1
+    I18n::Backend::ActiveRecord::Translation.delete_all
+    I18n.backend.store_translations(:en, :foo => 'foo')
+    I18n.backend.store_translations(:en, :foo => { :bar => 'bar' })
+    I18n.backend.store_translations(:en, :foo => { :baz => 'baz' })
+
+    translations = I18n::Backend::ActiveRecord::Translation.locale(:en).lookup('foo', '.').all
+    assert_equal %w(bar baz), translations.map(&:value)
+
+    assert_equal({ :bar => 'bar', :baz => 'baz' }, I18n.t(:foo))
+  end
+
+  def test_store_translations_does_not_allow_ambigous_keys_2
+    I18n::Backend::ActiveRecord::Translation.delete_all
+    I18n.backend.store_translations(:en, :foo => { :bar => 'bar' })
+    I18n.backend.store_translations(:en, :foo => { :baz => 'baz' })
+    I18n.backend.store_translations(:en, :foo => 'foo')
+
+    translations = I18n::Backend::ActiveRecord::Translation.locale(:en).lookup('foo', '.').all
+    assert_equal %w(foo), translations.map(&:value)
+
+    assert_equal 'foo', I18n.t(:foo)
+  end
+
+  def test_missing_translations_table_does_not_cause_available_locales_to_error
+    I18n::Backend::ActiveRecord::Translation.expects(:available_locales).raises(::ActiveRecord::StatementInvalid)
+    assert_equal [], I18n.backend.available_locales
+  end
+
+  def test_expand_keys
+    assert_equal %w(foo foo.bar foo.bar.baz), I18n.backend.send(:expand_keys, :'foo.bar.baz')
+  end
+end

data/test/backend/active_record/all.rb

@@ -0,0 +1,3 @@
+Dir[File.dirname(__FILE__) + '/*_test.rb'].each do |file|
+  require file
+end

data/test/backend/active_record/api_test.rb

@@ -0,0 +1,54 @@
+# encoding: utf-8
+require File.expand_path(File.dirname(__FILE__) + '/../../test_helper')
+require 'i18n/backend/active_record'
+
+class I18nActiveRecordBackendApiBasicsTest < Test::Unit::TestCase
+  include Tests::Backend::ActiveRecord::Setup::Base
+  include Tests::Backend::Api::Basics
+end
+
+class I18nActiveRecordBackendApiTranslateTest < Test::Unit::TestCase
+  include Tests::Backend::ActiveRecord::Setup::Base
+  include Tests::Backend::Api::Translation
+end
+
+class I18nActiveRecordBackendApiInterpolateTest < Test::Unit::TestCase
+  include Tests::Backend::ActiveRecord::Setup::Base
+  include Tests::Backend::Api::Interpolation
+end
+
+class I18nActiveRecordBackendApiLambdaTest < Test::Unit::TestCase
+  include Tests::Backend::ActiveRecord::Setup::Base
+  include Tests::Backend::Api::Lambda
+end
+
+class I18nActiveRecordBackendApiTranslateLinkedTest < Test::Unit::TestCase
+  include Tests::Backend::ActiveRecord::Setup::Base
+  include Tests::Backend::Api::Link
+end
+
+class I18nActiveRecordBackendApiPluralizationTest < Test::Unit::TestCase
+  include Tests::Backend::ActiveRecord::Setup::Base
+  include Tests::Backend::Api::Pluralization
+end
+
+class I18nActiveRecordBackendApiLocalizeDateTest < Test::Unit::TestCase
+  include Tests::Backend::ActiveRecord::Setup::Localization
+  include Tests::Backend::Api::Localization::Date
+end
+
+class I18nActiveRecordBackendApiLocalizeDateTimeTest < Test::Unit::TestCase
+  include Tests::Backend::ActiveRecord::Setup::Localization
+  include Tests::Backend::Api::Localization::DateTime
+end
+
+class I18nActiveRecordBackendApiLocalizeTimeTest < Test::Unit::TestCase
+  include Tests::Backend::ActiveRecord::Setup::Localization
+  include Tests::Backend::Api::Localization::Time
+end
+
+class I18nActiveRecordBackendApiLocalizeLambdaTest < Test::Unit::TestCase
+  include Tests::Backend::ActiveRecord::Setup::Localization
+  include Tests::Backend::Api::Localization::Lambda
+end
+

data/test/backend/active_record/setup.rb

@@ -0,0 +1,166 @@
+# encoding: utf-8
+require 'active_record'
+require 'i18n/backend/active_record/store_procs'
+
+if I18n::Backend::Simple.method_defined?(:interpolate_with_deprecated_syntax)
+  I18n::Backend::Simple.send(:remove_method, :interpolate) rescue NameError
+end
+
+ActiveRecord::Base.establish_connection(:adapter => "sqlite3", :database => ":memory:")
+ActiveRecord::Migration.verbose = false
+ActiveRecord::Schema.define(:version => 1) do
+  create_table :translations do |t|
+    t.string :locale
+    t.string :key
+    t.string :value
+    t.string :interpolations
+    t.boolean :is_proc, :default => false
+  end
+end
+
+module Tests
+  module Backend
+    module ActiveRecord
+      module Setup
+        module Base
+          def setup
+            super
+            I18n.locale = nil
+            I18n.default_locale = :en
+            I18n.backend = I18n::Backend::ActiveRecord.new
+            I18n::Backend::ActiveRecord::Translation.send(:include, I18n::Backend::ActiveRecord::StoreProcs)
+            backend_store_translations(:en, :foo => { :bar => 'bar', :baz => 'baz' })
+          end
+
+          def teardown
+            super
+            I18n::Backend::ActiveRecord::Translation.destroy_all
+            I18n.backend = nil
+          end
+        end
+
+        module Localization
+          include Base
+
+          def setup
+            super
+            setup_datetime_translations
+            setup_datetime_lambda_translations
+            @old_timezone, ENV['TZ'] = ENV['TZ'], 'UTC'
+          end
+
+          def teardown
+            super
+            @old_timezone ? ENV['TZ'] = @old_timezone : ENV.delete('TZ')
+          end
+
+          def setup_datetime_translations
+            backend_store_translations :de, {
+              :date => {
+                :formats => {
+                  :default => "%d.%m.%Y",
+                  :short => "%d. %b",
+                  :long => "%d. %B %Y",
+                  :long_ordinalized => lambda { |date, options|
+                    tz = " (#{options[:timezone]})" if options[:timezone]
+                    "#{date.day}ter %B %Y#{tz}"
+                  }
+                },
+                :day_names => %w(Sonntag Montag Dienstag Mittwoch Donnerstag Freitag Samstag),
+                :abbr_day_names => %w(So Mo Di Mi Do Fr  Sa),
+                :month_names => %w(Januar Februar März April Mai Juni Juli August September Oktober November Dezember).unshift(nil),
+                :abbr_month_names => %w(Jan Feb Mar Apr Mai Jun Jul Aug Sep Okt Nov Dez).unshift(nil),
+                :order => [:day, :month, :year]
+              },
+              :time => {
+                :formats => {
+                  :default => "%a, %d. %b %Y %H:%M:%S %z",
+                  :short => "%d. %b %H:%M",
+                  :long => "%d. %B %Y %H:%M",
+                  :long_ordinalized => lambda { |date, options|
+                    tz = " (#{options[:timezone]})" if options[:timezone]
+                    "#{date.day}ter %B %Y, %H:%M Uhr#{tz}"
+                  }
+                },
+                :am => 'am',
+                :pm => 'pm'
+              },
+              :datetime => {
+                :distance_in_words => {
+                  :half_a_minute => 'half a minute',
+                  :less_than_x_seconds => {
+                    :one => 'less than 1 second',
+                    :other => 'less than {{count}} seconds'
+                  },
+                  :x_seconds => {
+                    :one => '1 second',
+                    :other => '{{count}} seconds'
+                  },
+                  :less_than_x_minutes => {
+                    :one => 'less than a minute',
+                    :other => 'less than {{count}} minutes'
+                  },
+                  :x_minutes => {
+                    :one => '1 minute',
+                    :other => '{{count}} minutes'
+                  },
+                  :about_x_hours => {
+                    :one => 'about 1 hour',
+                    :other => 'about {{count}} hours'
+                  },
+                  :x_days => {
+                    :one => '1 day',
+                    :other => '{{count}} days'
+                  },
+                  :about_x_months => {
+                    :one => 'about 1 month',
+                    :other => 'about {{count}} months'
+                  },
+                  :x_months => {
+                    :one => '1 month',
+                    :other => '{{count}} months'
+                  },
+                  :about_x_years => {
+                    :one => 'about 1 year',
+                    :other => 'about {{count}} year'
+                  },
+                  :over_x_years => {
+                    :one => 'over 1 year',
+                    :other => 'over {{count}} years'
+                  }
+                }
+              }
+            }
+          end
+
+          def setup_datetime_lambda_translations
+            backend_store_translations 'ru', {
+              :date => {
+                :'day_names' => lambda { |key, options|
+                  (options[:format] =~ /^%A/) ?
+                  %w(Воскресенье Понедельник Вторник Среда Четверг Пятница Суббота) :
+                  %w(воскресенье понедельник вторник среда четверг пятница суббота)
+                },
+                :'abbr_day_names' => %w(Вс Пн Вт Ср Чт Пт Сб),
+                :'month_names' => lambda { |key, options|
+                  (options[:format] =~ /(%d|%e)(\s*)?(%B)/) ?
+                  %w(января февраля марта апреля мая июня июля августа сентября октября ноября декабря).unshift(nil) :
+                  %w(Январь Февраль Март Апрель Май Июнь Июль Август Сентябрь Октябрь Ноябрь Декабрь).unshift(nil)
+                },
+                :'abbr_month_names' => lambda { |key, options|
+                  (options[:format] =~ /(%d|%e)(\s*)(%b)/) ?
+                  %w(янв. февр. марта апр. мая июня июля авг. сент. окт. нояб. дек.).unshift(nil) :
+                  %w(янв. февр. март апр. май июнь июль авг. сент. окт. нояб. дек.).unshift(nil)
+                },
+              },
+              :time => {
+                :am => "утра",
+                :pm => "вечера"
+              }
+            }
+          end
+        end
+      end
+    end
+  end
+end

data/test/backend/active_record_missing/active_record_missing_test.rb

@@ -0,0 +1,63 @@
+# encoding: utf-8
+require File.expand_path(File.dirname(__FILE__) + '/../../test_helper')
+require 'i18n/backend/chain'
+require 'i18n/backend/active_record'
+require 'i18n/backend/active_record_missing'
+
+class I18nActiveRecordMissingTest < Test::Unit::TestCase
+  include Tests::Backend::ActiveRecord::Setup::Base
+  
+  def setup
+    I18n.backend.store_translations(:en, :i18n => { :plural_keys => [:zero, :one, :other] })
+    
+    I18n.backend = I18n::Backend::Chain.new(I18n.backend)
+    I18n.backend.meta_class.send(:include, I18n::Backend::ActiveRecordMissing)
+    
+    I18n::Backend::ActiveRecord::Translation.delete_all
+  end
+  
+  def test_can_persist_interpolations
+    translation = I18n::Backend::ActiveRecord::Translation.new \
+      :key => 'foo', 
+      :value => 'bar', 
+      :locale => :en
+    
+    translation.interpolations = %w{ count name }
+    translation.save
+    
+    assert translation.valid?
+  end
+
+  def test_lookup_persists_key
+    I18n.t('foo.bar.baz')
+    
+    assert_equal 1, I18n::Backend::ActiveRecord::Translation.count
+  end
+
+  def test_lookup_does_not_persist_key_twice
+    2.times { I18n.t('foo.bar.baz') }
+    
+    assert_equal 1, I18n::Backend::ActiveRecord::Translation.count
+  end
+  
+  def test_persists_interpolation_keys_when_looked_up_directly
+    I18n.t('foo.bar.baz', :cow => "lucy" )  # creates stub translation.
+    
+    translation_stub = I18n::Backend::ActiveRecord::Translation.locale(:en).lookup('foo.bar.baz').first
+    assert translation_stub.interpolates?(:cow)
+  end
+
+  def test_creates_one_stub_per_pluralization
+    I18n.t('foo', :count => 999)
+    
+    translations = I18n::Backend::ActiveRecord::Translation.locale(:en).find_all_by_key %w{ foo.zero foo.one foo.other }
+    assert_equal 3, translations.length
+  end
+  
+  def test_creates_no_stub_for_base_key_in_pluralization
+    I18n.t('foo', :count => 999)
+    
+    translations = I18n::Backend::ActiveRecord::Translation.locale(:en).find_by_key %w{ foo.zero foo.one foo.other }
+    assert !I18n::Backend::ActiveRecord::Translation.locale(:en).find_by_key("foo")
+  end
+end