i18n 0.2.0 → 0.2.1

data/test/api/lambda.rb

@@ -1,50 +1,50 @@
-module Tests
-  module Backend
-    module Api
-      module Lambda
-        def test_translate_simple_proc
-          setup_proc_translations
-          assert_equal 'bar=bar, baz=baz, foo=foo', I18n.backend.translate('en', :a_lambda, :foo => 'foo', :bar => 'bar', :baz => 'baz')
-        end
-
-        def test_translate_proc_in_defaults
-          setup_proc_translations
-          assert_equal 'bar=bar, baz=baz, foo=foo', I18n.backend.translate('en', :does_not_exist, :default => :a_lambda, :foo => 'foo', :bar => 'bar', :baz => 'baz')
-          assert_equal 'bar=bar, baz=baz, foo=foo', I18n.backend.translate('en', :does_not_exist, :default => [:does_not_exist_2, :does_not_exist_3, :a_lambda], :foo => 'foo', :bar => 'bar', :baz => 'baz')
-        end
-
-        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 'other', I18n.backend.translate('en', :lambda_for_pluralize, params.merge(:count => 2))
-        end
-
-        def test_translate_proc_with_interpolate
-          setup_proc_translations
-          assert_equal 'bar baz foo', I18n.backend.translate('en', :lambda_for_interpolate, :foo => 'foo', :bar => 'bar', :baz => 'baz')
-        end
-
-        def test_translate_with_proc_as_default
-          expected = 'result from lambda'
-          assert_equal expected, I18n.backend.translate(:en, :'does not exist', :default => lambda { |key, values| expected })
-        end
-
-        private
-
-          def setup_proc_translations
-            I18n.backend.store_translations 'en', {
-              :a_lambda => lambda { |key, values|
-                values.keys.sort_by(&:to_s).collect { |key| "#{key}=#{values[key]}"}.join(', ')
-              },
-              :lambda_for_pluralize => lambda { |key, values| values },
-              :lambda_for_interpolate => lambda { |key, values|
-                "{{#{values.keys.sort_by(&:to_s).join('}} {{')}}}"
-              }
-            }
-          end
-      end
-    end
-  end
+module Tests
+  module Backend
+    module Api
+      module Lambda
+        def test_translate_simple_proc
+          setup_proc_translations
+          assert_equal 'bar=bar, baz=baz, foo=foo', I18n.backend.translate('en', :a_lambda, :foo => 'foo', :bar => 'bar', :baz => 'baz')
+        end
+
+        def test_translate_proc_in_defaults
+          setup_proc_translations
+          assert_equal 'bar=bar, baz=baz, foo=foo', I18n.backend.translate('en', :does_not_exist, :default => :a_lambda, :foo => 'foo', :bar => 'bar', :baz => 'baz')
+          assert_equal 'bar=bar, baz=baz, foo=foo', I18n.backend.translate('en', :does_not_exist, :default => [:does_not_exist_2, :does_not_exist_3, :a_lambda], :foo => 'foo', :bar => 'bar', :baz => 'baz')
+        end
+
+        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 'other', I18n.backend.translate('en', :lambda_for_pluralize, params.merge(:count => 2))
+        end
+
+        def test_translate_proc_with_interpolate
+          setup_proc_translations
+          assert_equal 'bar baz foo', I18n.backend.translate('en', :lambda_for_interpolate, :foo => 'foo', :bar => 'bar', :baz => 'baz')
+        end
+
+        def test_translate_with_proc_as_default
+          expected = 'result from lambda'
+          assert_equal expected, I18n.backend.translate(:en, :'does not exist', :default => lambda { |key, values| expected })
+        end
+
+        private
+
+          def setup_proc_translations
+            I18n.backend.store_translations 'en', {
+              :a_lambda => lambda { |key, values|
+                values.keys.sort_by(&:to_s).collect { |key| "#{key}=#{values[key]}"}.join(', ')
+              },
+              :lambda_for_pluralize => lambda { |key, values| values },
+              :lambda_for_interpolate => lambda { |key, values|
+                "{{#{values.keys.sort_by(&:to_s).join('}} {{')}}}"
+              }
+            }
+          end
+      end
+    end
+  end
 end

data/test/api/link.rb

@@ -1,45 +1,45 @@
-module Tests
-  module Backend
-    module Api
-      module Link
-        def test_translate_calls_translate_if_resolves_to_a_symbol
-          setup_linked_translations
-          assert_equal 'foo', I18n.backend.translate('en', :link_to_foo)
-        end
-
-        def test_translate_calls_translate_if_resolves_to_a_symbol2
-          setup_linked_translations
-          assert_equal('baz', I18n.backend.translate('en', :link_to_baz))
-        end
-
-        def test_translate_calls_translate_if_resolves_to_a_symbol3
-          setup_linked_translations
-          assert I18n.backend.translate('en', :link_to_bar).key?(:baz)
-        end
-
-        def test_translate_calls_translate_if_resolves_to_a_symbol_with_scope_1
-          setup_linked_translations
-          assert_equal('baz', I18n.backend.translate('en', :link_to_baz, :scope => :bar))
-        end
-
-        def test_translate_calls_translate_if_resolves_to_a_symbol_with_scope_1
-          setup_linked_translations
-          assert_equal('buz', I18n.backend.translate('en', :'bar.link_to_buz'))
-        end
-
-        private
-  
-          def setup_linked_translations
-            I18n.backend.store_translations 'en', {
-              :foo => 'foo',
-              :bar => { :baz => 'baz', :link_to_baz => :baz, :link_to_buz => :'boz.buz' },
-              :boz => { :buz => 'buz' },
-              :link_to_foo => :foo,
-              :link_to_bar => :bar,
-              :link_to_baz => :'bar.baz'
-            }
-          end
-      end
-    end
-  end
+module Tests
+  module Backend
+    module Api
+      module Link
+        def test_translate_calls_translate_if_resolves_to_a_symbol
+          setup_linked_translations
+          assert_equal 'foo', I18n.backend.translate('en', :link_to_foo)
+        end
+
+        def test_translate_calls_translate_if_resolves_to_a_symbol2
+          setup_linked_translations
+          assert_equal('baz', I18n.backend.translate('en', :link_to_baz))
+        end
+
+        def test_translate_calls_translate_if_resolves_to_a_symbol3
+          setup_linked_translations
+          assert I18n.backend.translate('en', :link_to_bar).key?(:baz)
+        end
+
+        def test_translate_calls_translate_if_resolves_to_a_symbol_with_scope_1
+          setup_linked_translations
+          assert_equal('baz', I18n.backend.translate('en', :link_to_baz, :scope => :bar))
+        end
+
+        def test_translate_calls_translate_if_resolves_to_a_symbol_with_scope_1
+          setup_linked_translations
+          assert_equal('buz', I18n.backend.translate('en', :'bar.link_to_buz'))
+        end
+
+        private
+  
+          def setup_linked_translations
+            I18n.backend.store_translations 'en', {
+              :foo => 'foo',
+              :bar => { :baz => 'baz', :link_to_baz => :baz, :link_to_buz => :'boz.buz' },
+              :boz => { :buz => 'buz' },
+              :link_to_foo => :foo,
+              :link_to_bar => :bar,
+              :link_to_baz => :'bar.baz'
+            }
+          end
+      end
+    end
+  end
 end

data/test/api/localization/date.rb

@@ -1,63 +1,70 @@
-module Tests
-  module Backend
-    module Api
-      module Localization
-        module Date
-          # TODO should be Mrz, shouldn't it?
-          def test_localize_given_the_short_format_it_uses_it
-            assert_equal '01. Mar', I18n.backend.localize('de', date, :short)
-          end
-
-          def test_localize_given_the_long_format_it_uses_it
-            assert_equal '01. März 2008', I18n.backend.localize('de', date, :long)
-          end
-
-          def test_localize_given_the_default_format_it_uses_it
-            assert_equal '01.03.2008', I18n.backend.localize('de', date, :default)
-          end
-
-          def test_localize_given_a_day_name_format_it_returns_a_day_name
-            assert_equal 'Samstag', I18n.backend.localize('de', date, '%A')
-          end
-
-          def test_localize_given_an_abbr_day_name_format_it_returns_an_abbrevated_day_name
-            assert_equal 'Sa', I18n.backend.localize('de', date, '%a')
-          end
-
-          def test_localize_given_a_month_name_format_it_returns_a_month_name
-            assert_equal 'März', I18n.backend.localize('de', date, '%B')
-          end
-
-          # TODO should be Mrz, shouldn't it?
-          def test_localize_given_an_abbr_month_name_format_it_returns_an_abbrevated_month_name
-            assert_equal 'Mar', I18n.backend.localize('de', date, '%b')
-          end
-
-          def test_localize_given_a_format_specified_as_a_proc
-            assert_equal '1ter März 2008', I18n.backend.localize('de', date, :long_ordinalized)
-          end
-
-          def test_localize_given_a_format_specified_as_a_proc_with_additional_options
-            assert_equal '1ter März 2008 (MEZ)', I18n.backend.localize('de', date, :long_ordinalized, :timezone => 'MEZ')
-          end
-
-          def test_localize_given_no_format_it_does_not_fail
-            assert_nothing_raised{ I18n.backend.localize 'de', date }
-          end
-
-          def test_localize_given_an_unknown_format_it_does_not_fail
-            assert_nothing_raised{ I18n.backend.localize 'de', date, '%x' }
-          end
-
-          def test_localize_nil_raises_argument_error
-            assert_raises(I18n::ArgumentError) { I18n.backend.localize 'de', nil }
-          end
-
-          def test_localize_object_raises_argument_error
-            assert_raises(I18n::ArgumentError) { I18n.backend.localize 'de', Object.new }
-          end
-        end
-      end
-    end
-  end
-end
+module Tests
+  module Backend
+    module Api
+      module Localization
+        module Date
+          # TODO should be Mrz, shouldn't it?
+          def test_localize_given_the_short_format_it_uses_it
+            assert_equal '01. Mar', I18n.backend.localize('de', date, :short)
+          end
+
+          def test_localize_given_the_long_format_it_uses_it
+            assert_equal '01. März 2008', I18n.backend.localize('de', date, :long)
+          end
+
+          def test_localize_given_the_default_format_it_uses_it
+            assert_equal '01.03.2008', I18n.backend.localize('de', date, :default)
+          end
+
+          def test_localize_given_a_day_name_format_it_returns_a_day_name
+            assert_equal 'Samstag', I18n.backend.localize('de', date, '%A')
+          end
+
+          def test_localize_given_an_abbr_day_name_format_it_returns_an_abbrevated_day_name
+            assert_equal 'Sa', I18n.backend.localize('de', date, '%a')
+          end
+
+          def test_localize_given_a_month_name_format_it_returns_a_month_name
+            assert_equal 'März', I18n.backend.localize('de', date, '%B')
+          end
+
+          # TODO should be Mrz, shouldn't it?
+          def test_localize_given_an_abbr_month_name_format_it_returns_an_abbrevated_month_name
+            assert_equal 'Mar', I18n.backend.localize('de', date, '%b')
+          end
+
+          def test_localize_given_a_format_specified_as_a_proc
+            assert_equal '1ter März 2008', I18n.backend.localize('de', date, :long_ordinalized)
+          end
+
+          def test_localize_given_a_format_specified_as_a_proc_with_additional_options
+            assert_equal '1ter März 2008 (MEZ)', I18n.backend.localize('de', date, :long_ordinalized, :timezone => 'MEZ')
+          end
+
+          def test_localize_does_not_alter_the_stored_format_string
+            first_of_jan = I18n.backend.localize(:de, ::Date.parse('2009-01-01'), :long)
+            first_of_oct = I18n.backend.localize(:de, ::Date.parse('2009-10-01'), :long)
+            assert_equal '01. Januar 2009', first_of_jan
+            assert_equal '01. Oktober 2009', first_of_oct
+          end
+
+          def test_localize_given_no_format_it_does_not_fail
+            assert_nothing_raised{ I18n.backend.localize 'de', date }
+          end
+
+          def test_localize_given_an_unknown_format_it_does_not_fail
+            assert_nothing_raised{ I18n.backend.localize 'de', date, '%x' }
+          end
+
+          def test_localize_nil_raises_argument_error
+            assert_raises(I18n::ArgumentError) { I18n.backend.localize 'de', nil }
+          end
+
+          def test_localize_object_raises_argument_error
+            assert_raises(I18n::ArgumentError) { I18n.backend.localize 'de', Object.new }
+          end
+        end
+      end
+    end
+  end
+end

data/test/api/localization/date_time.rb

@@ -1,61 +1,61 @@
-module Tests
-  module Backend
-    module Api
-      module Localization
-        module DateTime
-          # TODO should be Mrz, shouldn't it?
-          def test_localize_given_the_short_format_it_uses_it
-            assert_equal '01. Mar 06:00', I18n.backend.localize('de', morning_datetime, :short)
-          end
-
-          def test_localize_given_the_long_format_it_uses_it
-            assert_equal '01. März 2008 06:00', I18n.backend.localize('de', morning_datetime, :long)
-          end
-
-          # TODO should be Mrz, shouldn't it?
-          def test_localize_given_the_default_format_it_uses_it
-            assert_equal 'Sa, 01. Mar 2008 06:00:00 +0000', I18n.backend.localize('de', morning_datetime, :default)
-          end
-
-          def test_localize_given_a_day_name_format_it_returns_the_correct_day_name
-            assert_equal 'Samstag', I18n.backend.localize('de', morning_datetime, '%A')
-          end
-
-          def test_localize_given_an_abbr_day_name_format_it_returns_the_correct_abbrevated_day_name
-            assert_equal 'Sa', I18n.backend.localize('de', morning_datetime, '%a')
-          end
-
-          def test_localize_given_a_month_name_format_it_returns_the_correct_month_name
-            assert_equal 'März', I18n.backend.localize('de', morning_datetime, '%B')
-          end
-
-          # TODO should be Mrz, shouldn't it?
-          def test_localize_given_an_abbr_month_name_format_it_returns_the_correct_abbrevated_month_name
-            assert_equal 'Mar', I18n.backend.localize('de', morning_datetime, '%b')
-          end
-
-          def test_localize_given_a_meridian_indicator_format_it_returns_the_correct_meridian_indicator
-            assert_equal 'am', I18n.backend.localize('de', morning_datetime, '%p')
-            assert_equal 'pm', I18n.backend.localize('de', evening_datetime, '%p')
-          end
-
-          def test_localize_given_a_format_specified_as_a_proc
-            assert_equal '1ter März 2008, 06:00 Uhr', I18n.backend.localize('de', morning_datetime, :long_ordinalized)
-          end
-
-          def test_localize_given_a_format_specified_as_a_proc_with_additional_options
-            assert_equal '1ter März 2008, 06:00 Uhr (MEZ)', I18n.backend.localize('de', morning_datetime, :long_ordinalized, :timezone => 'MEZ')
-          end
-
-          def test_localize_given_no_format_it_does_not_fail
-            assert_nothing_raised{ I18n.backend.localize 'de', morning_datetime }
-          end
-
-          def test_localize_given_an_unknown_format_it_does_not_fail
-            assert_nothing_raised{ I18n.backend.localize 'de', morning_datetime, '%x' }
-          end
-        end
-      end
-    end
-  end
+module Tests
+  module Backend
+    module Api
+      module Localization
+        module DateTime
+          # TODO should be Mrz, shouldn't it?
+          def test_localize_given_the_short_format_it_uses_it
+            assert_equal '01. Mar 06:00', I18n.backend.localize('de', morning_datetime, :short)
+          end
+
+          def test_localize_given_the_long_format_it_uses_it
+            assert_equal '01. März 2008 06:00', I18n.backend.localize('de', morning_datetime, :long)
+          end
+
+          # TODO should be Mrz, shouldn't it?
+          def test_localize_given_the_default_format_it_uses_it
+            assert_equal 'Sa, 01. Mar 2008 06:00:00 +0000', I18n.backend.localize('de', morning_datetime, :default)
+          end
+
+          def test_localize_given_a_day_name_format_it_returns_the_correct_day_name
+            assert_equal 'Samstag', I18n.backend.localize('de', morning_datetime, '%A')
+          end
+
+          def test_localize_given_an_abbr_day_name_format_it_returns_the_correct_abbrevated_day_name
+            assert_equal 'Sa', I18n.backend.localize('de', morning_datetime, '%a')
+          end
+
+          def test_localize_given_a_month_name_format_it_returns_the_correct_month_name
+            assert_equal 'März', I18n.backend.localize('de', morning_datetime, '%B')
+          end
+
+          # TODO should be Mrz, shouldn't it?
+          def test_localize_given_an_abbr_month_name_format_it_returns_the_correct_abbrevated_month_name
+            assert_equal 'Mar', I18n.backend.localize('de', morning_datetime, '%b')
+          end
+
+          def test_localize_given_a_meridian_indicator_format_it_returns_the_correct_meridian_indicator
+            assert_equal 'am', I18n.backend.localize('de', morning_datetime, '%p')
+            assert_equal 'pm', I18n.backend.localize('de', evening_datetime, '%p')
+          end
+
+          def test_localize_given_a_format_specified_as_a_proc
+            assert_equal '1ter März 2008, 06:00 Uhr', I18n.backend.localize('de', morning_datetime, :long_ordinalized)
+          end
+
+          def test_localize_given_a_format_specified_as_a_proc_with_additional_options
+            assert_equal '1ter März 2008, 06:00 Uhr (MEZ)', I18n.backend.localize('de', morning_datetime, :long_ordinalized, :timezone => 'MEZ')
+          end
+
+          def test_localize_given_no_format_it_does_not_fail
+            assert_nothing_raised{ I18n.backend.localize 'de', morning_datetime }
+          end
+
+          def test_localize_given_an_unknown_format_it_does_not_fail
+            assert_nothing_raised{ I18n.backend.localize 'de', morning_datetime, '%x' }
+          end
+        end
+      end
+    end
+  end
 end

data/test/api/localization/lambda.rb

@@ -1,24 +1,24 @@
-module Tests
-  module Backend
-    module Api
-      module Localization
-        module Lambda
-          def test_localize_uses_lambda_day_names
-            assert_match /Суббота/, I18n.backend.localize('ru', time, "%A, %d %B")
-            assert_match /суббота/, I18n.backend.localize('ru', time, "%d %B (%A)")
-          end
-
-          def test_localize_uses_lambda_month_names
-            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")
-          end
-        end
-      end
-    end
-  end
+module Tests
+  module Backend
+    module Api
+      module Localization
+        module Lambda
+          def test_localize_uses_lambda_day_names
+            assert_match /Суббота/, I18n.backend.localize('ru', time, "%A, %d %B")
+            assert_match /суббота/, I18n.backend.localize('ru', time, "%d %B (%A)")
+          end
+
+          def test_localize_uses_lambda_month_names
+            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")
+          end
+        end
+      end
+    end
+  end
 end