From c4b10b246aecf7da78cb2568dd0d2ab7e6b8a230 Mon Sep 17 00:00:00 2001 From: Yaroslav Markin Date: Thu, 20 Nov 2008 19:44:35 +0300 Subject: [PATCH] Using :'en' as a default locale (in favor of :'en-US'). Bump version to 0.1.1. --- i18n.gemspec | 8 +- lib/i18n.rb | 6 +- test/i18n_exceptions_test.rb | 20 ++--- test/i18n_test.rb | 36 ++++----- test/locale/en-US.rb | 1 - test/locale/en-US.yml | 3 - test/locale/en.rb | 1 + test/locale/en.yml | 3 + test/simple_backend_test.rb | 140 +++++++++++++++++------------------ 9 files changed, 109 insertions(+), 109 deletions(-) delete mode 100644 test/locale/en-US.rb delete mode 100644 test/locale/en-US.yml create mode 100644 test/locale/en.rb create mode 100644 test/locale/en.yml diff --git a/i18n.gemspec b/i18n.gemspec index c852dedd..14294606 100644 --- a/i18n.gemspec +++ b/i18n.gemspec @@ -1,6 +1,6 @@ Gem::Specification.new do |s| s.name = "i18n" - s.version = "0.1.0" + s.version = "0.1.1" s.date = "2008-10-26" s.summary = "Internationalization support for Ruby" s.email = "rails-i18n@googlegroups.com" @@ -20,8 +20,8 @@ Gem::Specification.new do |s| 'test/all.rb', 'test/i18n_exceptions_test.rb', 'test/i18n_test.rb', - 'test/locale/en-US.rb', - 'test/locale/en-US.yml', + 'test/locale/en.rb', + 'test/locale/en.yml', 'test/simple_backend_test.rb' ] -end \ No newline at end of file +end diff --git a/lib/i18n.rb b/lib/i18n.rb index d622b304..b5ad094d 100755 --- a/lib/i18n.rb +++ b/lib/i18n.rb @@ -11,7 +11,7 @@ module I18n @@backend = nil @@load_path = nil - @@default_locale = :'en-US' + @@default_locale = :'en' @@exception_handler = :default_exception_handler class << self @@ -25,7 +25,7 @@ def backend=(backend) @@backend = backend end - # Returns the current default locale. Defaults to 'en-US' + # Returns the current default locale. Defaults to :'en' def default_locale @@default_locale end @@ -57,7 +57,7 @@ def exception_handler=(exception_handler) # files which are either named *.rb and contain plain Ruby Hashes or are # named *.yml and contain YAML data. So for the SimpleBackend clients may # register translation files like this: - # I18n.load_path << 'path/to/locale/en-US.yml' + # I18n.load_path << 'path/to/locale/en.yml' def load_path @@load_path ||= [] end diff --git a/test/i18n_exceptions_test.rb b/test/i18n_exceptions_test.rb index 3f07254d..dfcba690 100644 --- a/test/i18n_exceptions_test.rb +++ b/test/i18n_exceptions_test.rb @@ -23,7 +23,7 @@ def test_missing_translation_data_stores_locale_key_and_options force_missing_translation_data rescue I18n::ArgumentError => e options = {:scope => :bar} - assert_equal 'de-DE', e.locale + assert_equal 'de', e.locale assert_equal :foo, e.key assert_equal options, e.options end @@ -31,7 +31,7 @@ def test_missing_translation_data_stores_locale_key_and_options def test_missing_translation_data_message force_missing_translation_data rescue I18n::ArgumentError => e - assert_equal 'translation missing: de-DE, bar, foo', e.message + assert_equal 'translation missing: de, bar, foo', e.message end def test_invalid_pluralization_data_stores_entry_and_count @@ -79,22 +79,22 @@ def force_invalid_locale end def force_missing_translation_data - I18n.backend.store_translations 'de-DE', :bar => nil - I18n.backend.translate 'de-DE', :foo, :scope => :bar + I18n.backend.store_translations 'de', :bar => nil + I18n.backend.translate 'de', :foo, :scope => :bar end def force_invalid_pluralization_data - I18n.backend.store_translations 'de-DE', :foo => [:bar] - I18n.backend.translate 'de-DE', :foo, :count => 1 + I18n.backend.store_translations 'de', :foo => [:bar] + I18n.backend.translate 'de', :foo, :count => 1 end def force_missing_interpolation_argument - I18n.backend.store_translations 'de-DE', :foo => "{{bar}}" - I18n.backend.translate 'de-DE', :foo, :baz => 'baz' + I18n.backend.store_translations 'de', :foo => "{{bar}}" + I18n.backend.translate 'de', :foo, :baz => 'baz' end def force_reserved_interpolation_key - I18n.backend.store_translations 'de-DE', :foo => "{{scope}}" - I18n.backend.translate 'de-DE', :foo, :baz => 'baz' + I18n.backend.store_translations 'de', :foo => "{{scope}}" + I18n.backend.translate 'de', :foo, :baz => 'baz' end end \ No newline at end of file diff --git a/test/i18n_test.rb b/test/i18n_test.rb index 0aa6a0fa..bbb35ec8 100644 --- a/test/i18n_test.rb +++ b/test/i18n_test.rb @@ -8,7 +8,7 @@ class I18nTest < Test::Unit::TestCase def setup - I18n.backend.store_translations :'en-US', { + I18n.backend.store_translations :'en', { :currency => { :format => { :separator => '.', @@ -29,13 +29,13 @@ def test_can_set_backend end def test_uses_en_us_as_default_locale_by_default - assert_equal 'en-US', I18n.default_locale + assert_equal 'en', I18n.default_locale end def test_can_set_default_locale - assert_nothing_raised{ I18n.default_locale = 'de-DE' } - assert_equal 'de-DE', I18n.default_locale - I18n.default_locale = 'en-US' + assert_nothing_raised{ I18n.default_locale = 'de' } + assert_equal 'de', I18n.default_locale + I18n.default_locale = 'en' end def test_uses_default_locale_as_locale_by_default @@ -43,10 +43,10 @@ def test_uses_default_locale_as_locale_by_default end def test_can_set_locale_to_thread_current - assert_nothing_raised{ I18n.locale = 'de-DE' } - assert_equal 'de-DE', I18n.locale - assert_equal 'de-DE', Thread.current[:locale] - I18n.locale = 'en-US' + assert_nothing_raised{ I18n.locale = 'de' } + assert_equal 'de', I18n.locale + assert_equal 'de', Thread.current[:locale] + I18n.locale = 'en' end def test_can_set_exception_handler @@ -62,17 +62,17 @@ def test_uses_custom_exception_handler end def test_delegates_translate_to_backend - I18n.backend.expects(:translate).with 'de-DE', :foo, {} - I18n.translate :foo, :locale => 'de-DE' + I18n.backend.expects(:translate).with 'de', :foo, {} + I18n.translate :foo, :locale => 'de' end def test_delegates_localize_to_backend - I18n.backend.expects(:localize).with 'de-DE', :whatever, :default - I18n.localize :whatever, :locale => 'de-DE' + I18n.backend.expects(:localize).with 'de', :whatever, :default + I18n.localize :whatever, :locale => 'de' end def test_translate_given_no_locale_uses_i18n_locale - I18n.backend.expects(:translate).with 'en-US', :foo, {} + I18n.backend.expects(:translate).with 'en', :foo, {} I18n.translate :foo end @@ -101,18 +101,18 @@ def test_translate_with_dot_separated_key_array_and_scope_works end def test_translate_with_options_using_scope_works - I18n.backend.expects(:translate).with('de-DE', :precision, :scope => :"currency.format") - I18n.with_options :locale => 'de-DE', :scope => :'currency.format' do |locale| + I18n.backend.expects(:translate).with('de', :precision, :scope => :"currency.format") + I18n.with_options :locale => 'de', :scope => :'currency.format' do |locale| locale.t :precision end end # def test_translate_given_no_args_raises_missing_translation_data - # assert_equal "translation missing: en-US, no key", I18n.t + # assert_equal "translation missing: en, no key", I18n.t # end def test_translate_given_a_bogus_key_raises_missing_translation_data - assert_equal "translation missing: en-US, bogus", I18n.t(:bogus) + assert_equal "translation missing: en, bogus", I18n.t(:bogus) end def test_localize_nil_raises_argument_error diff --git a/test/locale/en-US.rb b/test/locale/en-US.rb deleted file mode 100644 index ab039456..00000000 --- a/test/locale/en-US.rb +++ /dev/null @@ -1 +0,0 @@ -{:'en-US-Ruby' => {:foo => {:bar => "baz"}}} \ No newline at end of file diff --git a/test/locale/en-US.yml b/test/locale/en-US.yml deleted file mode 100644 index 7a5c217d..00000000 --- a/test/locale/en-US.yml +++ /dev/null @@ -1,3 +0,0 @@ -en-US-Yaml: - foo: - bar: baz \ No newline at end of file diff --git a/test/locale/en.rb b/test/locale/en.rb new file mode 100644 index 00000000..6044ce10 --- /dev/null +++ b/test/locale/en.rb @@ -0,0 +1 @@ +{:'en-Ruby' => {:foo => {:bar => "baz"}}} \ No newline at end of file diff --git a/test/locale/en.yml b/test/locale/en.yml new file mode 100644 index 00000000..0b298c9c --- /dev/null +++ b/test/locale/en.yml @@ -0,0 +1,3 @@ +en-Yaml: + foo: + bar: baz \ No newline at end of file diff --git a/test/simple_backend_test.rb b/test/simple_backend_test.rb index 4f510e4c..e181975f 100644 --- a/test/simple_backend_test.rb +++ b/test/simple_backend_test.rb @@ -12,7 +12,7 @@ module I18nSimpleBackendTestSetup def setup_backend # backend_reset_translations! @backend = I18n::Backend::Simple.new - @backend.store_translations 'en-US', :foo => {:bar => 'bar', :baz => 'baz'} + @backend.store_translations 'en', :foo => {:bar => 'bar', :baz => 'baz'} @locale_dir = File.dirname(__FILE__) + '/locale' end alias :setup :setup_backend @@ -27,7 +27,7 @@ def backend_get_translations end def add_datetime_translations - @backend.store_translations :'de-DE', { + @backend.store_translations :'de', { :date => { :formats => { :default => "%d.%m.%Y", @@ -102,25 +102,25 @@ class I18nSimpleBackendTranslationsTest < Test::Unit::TestCase include I18nSimpleBackendTestSetup def test_store_translations_adds_translations # no, really :-) - @backend.store_translations :'en-US', :foo => 'bar' - assert_equal Hash[:'en-US', {:foo => 'bar'}], backend_get_translations + @backend.store_translations :'en', :foo => 'bar' + assert_equal Hash[:'en', {:foo => 'bar'}], backend_get_translations end def test_store_translations_deep_merges_translations - @backend.store_translations :'en-US', :foo => {:bar => 'bar'} - @backend.store_translations :'en-US', :foo => {:baz => 'baz'} - assert_equal Hash[:'en-US', {:foo => {:bar => 'bar', :baz => 'baz'}}], backend_get_translations + @backend.store_translations :'en', :foo => {:bar => 'bar'} + @backend.store_translations :'en', :foo => {:baz => 'baz'} + assert_equal Hash[:'en', {:foo => {:bar => 'bar', :baz => 'baz'}}], backend_get_translations end def test_store_translations_forces_locale_to_sym - @backend.store_translations 'en-US', :foo => 'bar' - assert_equal Hash[:'en-US', {:foo => 'bar'}], backend_get_translations + @backend.store_translations 'en', :foo => 'bar' + assert_equal Hash[:'en', {:foo => 'bar'}], backend_get_translations end def test_store_translations_converts_keys_to_symbols # backend_reset_translations! - @backend.store_translations 'en-US', 'foo' => {'bar' => 'bar', 'baz' => 'baz'} - assert_equal Hash[:'en-US', {:foo => {:bar => 'bar', :baz => 'baz'}}], backend_get_translations + @backend.store_translations 'en', 'foo' => {'bar' => 'bar', 'baz' => 'baz'} + assert_equal Hash[:'en', {:foo => {:bar => 'bar', :baz => 'baz'}}], backend_get_translations end end @@ -128,45 +128,45 @@ class I18nSimpleBackendTranslateTest < Test::Unit::TestCase include I18nSimpleBackendTestSetup def test_translate_calls_lookup_with_locale_given - @backend.expects(:lookup).with('de-DE', :bar, [:foo]).returns 'bar' - @backend.translate 'de-DE', :bar, :scope => [:foo] + @backend.expects(:lookup).with('de', :bar, [:foo]).returns 'bar' + @backend.translate 'de', :bar, :scope => [:foo] end def test_given_no_keys_it_returns_the_default - assert_equal 'default', @backend.translate('en-US', nil, :default => 'default') + assert_equal 'default', @backend.translate('en', nil, :default => 'default') end def test_translate_given_a_symbol_as_a_default_translates_the_symbol - assert_equal 'bar', @backend.translate('en-US', nil, :scope => [:foo], :default => :bar) + assert_equal 'bar', @backend.translate('en', nil, :scope => [:foo], :default => :bar) end def test_translate_given_an_array_as_default_uses_the_first_match - assert_equal 'bar', @backend.translate('en-US', :does_not_exist, :scope => [:foo], :default => [:does_not_exist_2, :bar]) + assert_equal 'bar', @backend.translate('en', :does_not_exist, :scope => [:foo], :default => [:does_not_exist_2, :bar]) end def test_translate_given_an_array_of_inexistent_keys_it_raises_missing_translation_data assert_raises I18n::MissingTranslationData do - @backend.translate('en-US', :does_not_exist, :scope => [:foo], :default => [:does_not_exist_2, :does_not_exist_3]) + @backend.translate('en', :does_not_exist, :scope => [:foo], :default => [:does_not_exist_2, :does_not_exist_3]) end end def test_translate_an_array_of_keys_translates_all_of_them - assert_equal %w(bar baz), @backend.translate('en-US', [:bar, :baz], :scope => [:foo]) + assert_equal %w(bar baz), @backend.translate('en', [:bar, :baz], :scope => [:foo]) end def test_translate_calls_pluralize - @backend.expects(:pluralize).with 'en-US', 'bar', 1 - @backend.translate 'en-US', :bar, :scope => [:foo], :count => 1 + @backend.expects(:pluralize).with 'en', 'bar', 1 + @backend.translate 'en', :bar, :scope => [:foo], :count => 1 end def test_translate_calls_interpolate - @backend.expects(:interpolate).with 'en-US', 'bar', {} - @backend.translate 'en-US', :bar, :scope => [:foo] + @backend.expects(:interpolate).with 'en', 'bar', {} + @backend.translate 'en', :bar, :scope => [:foo] end def test_translate_calls_interpolate_including_count_as_a_value - @backend.expects(:interpolate).with 'en-US', 'bar', {:count => 1} - @backend.translate 'en-US', :bar, :scope => [:foo], :count => 1 + @backend.expects(:interpolate).with 'en', 'bar', {:count => 1} + @backend.translate 'en', :bar, :scope => [:foo], :count => 1 end def test_translate_given_nil_as_a_locale_raises_an_argument_error @@ -174,7 +174,7 @@ def test_translate_given_nil_as_a_locale_raises_an_argument_error end def test_translate_with_a_bogus_key_and_no_default_raises_missing_translation_data - assert_raises(I18n::MissingTranslationData){ @backend.translate 'de-DE', :bogus } + assert_raises(I18n::MissingTranslationData){ @backend.translate 'de', :bogus } end end @@ -183,11 +183,11 @@ class I18nSimpleBackendLookupTest < Test::Unit::TestCase # useful because this way we can use the backend with no key for interpolation/pluralization def test_lookup_given_nil_as_a_key_returns_nil - assert_nil @backend.send(:lookup, 'en-US', nil) + assert_nil @backend.send(:lookup, 'en', nil) end def test_lookup_given_nested_keys_looks_up_a_nested_hash_value - assert_equal 'bar', @backend.send(:lookup, 'en-US', :bar, [:foo]) + assert_equal 'bar', @backend.send(:lookup, 'en', :bar, [:foo]) end end @@ -274,47 +274,47 @@ def setup end def test_translate_given_the_short_format_it_uses_it - assert_equal '01. Jan', @backend.localize('de-DE', @date, :short) + assert_equal '01. Jan', @backend.localize('de', @date, :short) end def test_translate_given_the_long_format_it_uses_it - assert_equal '01. Januar 2008', @backend.localize('de-DE', @date, :long) + assert_equal '01. Januar 2008', @backend.localize('de', @date, :long) end def test_translate_given_the_default_format_it_uses_it - assert_equal '01.01.2008', @backend.localize('de-DE', @date, :default) + assert_equal '01.01.2008', @backend.localize('de', @date, :default) end def test_translate_given_a_day_name_format_it_returns_a_day_name - assert_equal 'Dienstag', @backend.localize('de-DE', @date, '%A') + assert_equal 'Dienstag', @backend.localize('de', @date, '%A') end def test_translate_given_an_abbr_day_name_format_it_returns_an_abbrevated_day_name - assert_equal 'Di', @backend.localize('de-DE', @date, '%a') + assert_equal 'Di', @backend.localize('de', @date, '%a') end def test_translate_given_a_month_name_format_it_returns_a_month_name - assert_equal 'Januar', @backend.localize('de-DE', @date, '%B') + assert_equal 'Januar', @backend.localize('de', @date, '%B') end def test_translate_given_an_abbr_month_name_format_it_returns_an_abbrevated_month_name - assert_equal 'Jan', @backend.localize('de-DE', @date, '%b') + assert_equal 'Jan', @backend.localize('de', @date, '%b') end def test_translate_given_no_format_it_does_not_fail - assert_nothing_raised{ @backend.localize 'de-DE', @date } + assert_nothing_raised{ @backend.localize 'de', @date } end def test_translate_given_an_unknown_format_it_does_not_fail - assert_nothing_raised{ @backend.localize 'de-DE', @date, '%x' } + assert_nothing_raised{ @backend.localize 'de', @date, '%x' } end def test_localize_nil_raises_argument_error - assert_raises(I18n::ArgumentError) { @backend.localize 'de-DE', nil } + assert_raises(I18n::ArgumentError) { @backend.localize 'de', nil } end def test_localize_object_raises_argument_error - assert_raises(I18n::ArgumentError) { @backend.localize 'de-DE', Object.new } + assert_raises(I18n::ArgumentError) { @backend.localize 'de', Object.new } end end @@ -329,44 +329,44 @@ def setup end def test_translate_given_the_short_format_it_uses_it - assert_equal '01. Jan 06:00', @backend.localize('de-DE', @morning, :short) + assert_equal '01. Jan 06:00', @backend.localize('de', @morning, :short) end def test_translate_given_the_long_format_it_uses_it - assert_equal '01. Januar 2008 06:00', @backend.localize('de-DE', @morning, :long) + assert_equal '01. Januar 2008 06:00', @backend.localize('de', @morning, :long) end def test_translate_given_the_default_format_it_uses_it - assert_equal 'Di, 01. Jan 2008 06:00:00 +0000', @backend.localize('de-DE', @morning, :default) + assert_equal 'Di, 01. Jan 2008 06:00:00 +0000', @backend.localize('de', @morning, :default) end def test_translate_given_a_day_name_format_it_returns_the_correct_day_name - assert_equal 'Dienstag', @backend.localize('de-DE', @morning, '%A') + assert_equal 'Dienstag', @backend.localize('de', @morning, '%A') end def test_translate_given_an_abbr_day_name_format_it_returns_the_correct_abbrevated_day_name - assert_equal 'Di', @backend.localize('de-DE', @morning, '%a') + assert_equal 'Di', @backend.localize('de', @morning, '%a') end def test_translate_given_a_month_name_format_it_returns_the_correct_month_name - assert_equal 'Januar', @backend.localize('de-DE', @morning, '%B') + assert_equal 'Januar', @backend.localize('de', @morning, '%B') end def test_translate_given_an_abbr_month_name_format_it_returns_the_correct_abbrevated_month_name - assert_equal 'Jan', @backend.localize('de-DE', @morning, '%b') + assert_equal 'Jan', @backend.localize('de', @morning, '%b') end def test_translate_given_a_meridian_indicator_format_it_returns_the_correct_meridian_indicator - assert_equal 'am', @backend.localize('de-DE', @morning, '%p') - assert_equal 'pm', @backend.localize('de-DE', @evening, '%p') + assert_equal 'am', @backend.localize('de', @morning, '%p') + assert_equal 'pm', @backend.localize('de', @evening, '%p') end def test_translate_given_no_format_it_does_not_fail - assert_nothing_raised{ @backend.localize 'de-DE', @morning } + assert_nothing_raised{ @backend.localize 'de', @morning } end def test_translate_given_an_unknown_format_it_does_not_fail - assert_nothing_raised{ @backend.localize 'de-DE', @morning, '%x' } + assert_nothing_raised{ @backend.localize 'de', @morning, '%x' } end end @@ -386,45 +386,45 @@ def teardown end def test_translate_given_the_short_format_it_uses_it - assert_equal '01. Jan 06:00', @backend.localize('de-DE', @morning, :short) + assert_equal '01. Jan 06:00', @backend.localize('de', @morning, :short) end def test_translate_given_the_long_format_it_uses_it - assert_equal '01. Januar 2008 06:00', @backend.localize('de-DE', @morning, :long) + assert_equal '01. Januar 2008 06:00', @backend.localize('de', @morning, :long) end # TODO Seems to break on Windows because ENV['TZ'] is ignored. What's a better way to do this? # def test_translate_given_the_default_format_it_uses_it - # assert_equal 'Di, 01. Jan 2008 06:00:00 +0000', @backend.localize('de-DE', @morning, :default) + # assert_equal 'Di, 01. Jan 2008 06:00:00 +0000', @backend.localize('de', @morning, :default) # end def test_translate_given_a_day_name_format_it_returns_the_correct_day_name - assert_equal 'Dienstag', @backend.localize('de-DE', @morning, '%A') + assert_equal 'Dienstag', @backend.localize('de', @morning, '%A') end def test_translate_given_an_abbr_day_name_format_it_returns_the_correct_abbrevated_day_name - assert_equal 'Di', @backend.localize('de-DE', @morning, '%a') + assert_equal 'Di', @backend.localize('de', @morning, '%a') end def test_translate_given_a_month_name_format_it_returns_the_correct_month_name - assert_equal 'Januar', @backend.localize('de-DE', @morning, '%B') + assert_equal 'Januar', @backend.localize('de', @morning, '%B') end def test_translate_given_an_abbr_month_name_format_it_returns_the_correct_abbrevated_month_name - assert_equal 'Jan', @backend.localize('de-DE', @morning, '%b') + assert_equal 'Jan', @backend.localize('de', @morning, '%b') end def test_translate_given_a_meridian_indicator_format_it_returns_the_correct_meridian_indicator - assert_equal 'am', @backend.localize('de-DE', @morning, '%p') - assert_equal 'pm', @backend.localize('de-DE', @evening, '%p') + assert_equal 'am', @backend.localize('de', @morning, '%p') + assert_equal 'pm', @backend.localize('de', @evening, '%p') end def test_translate_given_no_format_it_does_not_fail - assert_nothing_raised{ @backend.localize 'de-DE', @morning } + assert_nothing_raised{ @backend.localize 'de', @morning } end def test_translate_given_an_unknown_format_it_does_not_fail - assert_nothing_raised{ @backend.localize 'de-DE', @morning, '%x' } + assert_nothing_raised{ @backend.localize 'de', @morning, '%x' } end end @@ -444,29 +444,29 @@ class I18nSimpleBackendLoadTranslationsTest < Test::Unit::TestCase include I18nSimpleBackendTestSetup def test_load_translations_with_unknown_file_type_raises_exception - assert_raises(I18n::UnknownFileType) { @backend.load_translations "#{@locale_dir}/en-US.xml" } + assert_raises(I18n::UnknownFileType) { @backend.load_translations "#{@locale_dir}/en.xml" } end def test_load_translations_with_ruby_file_type_does_not_raise_exception - assert_nothing_raised { @backend.load_translations "#{@locale_dir}/en-US.rb" } + assert_nothing_raised { @backend.load_translations "#{@locale_dir}/en.rb" } end def test_load_rb_loads_data_from_ruby_file - data = @backend.send :load_rb, "#{@locale_dir}/en-US.rb" - assert_equal({:'en-US-Ruby' => {:foo => {:bar => "baz"}}}, data) + data = @backend.send :load_rb, "#{@locale_dir}/en.rb" + assert_equal({:'en-Ruby' => {:foo => {:bar => "baz"}}}, data) end def test_load_rb_loads_data_from_yaml_file - data = @backend.send :load_yml, "#{@locale_dir}/en-US.yml" - assert_equal({'en-US-Yaml' => {'foo' => {'bar' => 'baz'}}}, data) + data = @backend.send :load_yml, "#{@locale_dir}/en.yml" + assert_equal({'en-Yaml' => {'foo' => {'bar' => 'baz'}}}, data) end def test_load_translations_loads_from_different_file_formats @backend = I18n::Backend::Simple.new - @backend.load_translations "#{@locale_dir}/en-US.rb", "#{@locale_dir}/en-US.yml" + @backend.load_translations "#{@locale_dir}/en.rb", "#{@locale_dir}/en.yml" expected = { - :'en-US-Ruby' => {:foo => {:bar => "baz"}}, - :'en-US-Yaml' => {:foo => {:bar => "baz"}} + :'en-Ruby' => {:foo => {:bar => "baz"}}, + :'en-Yaml' => {:foo => {:bar => "baz"}} } assert_equal expected, backend_get_translations end @@ -477,7 +477,7 @@ class I18nSimpleBackendReloadTranslationsTest < Test::Unit::TestCase def setup @backend = I18n::Backend::Simple.new - I18n.load_path = [File.dirname(__FILE__) + '/locale/en-US.yml'] + I18n.load_path = [File.dirname(__FILE__) + '/locale/en.yml'] assert_nil backend_get_translations @backend.send :init_translations end