diff options
author | Sven Fuchs <svenfuchs@artweb-design.de> | 2008-11-18 09:59:46 +0100 |
---|---|---|
committer | David Heinemeier Hansson <david@loudthinking.com> | 2008-11-18 14:23:53 +0100 |
commit | 12118963acacc9c869bdd41ef8480a1a4e06d358 (patch) | |
tree | f08b102f58bcf9d3b87e1dab97d6f62f5c844b69 /actionpack/test/template/translation_helper_test.rb | |
parent | d9b92ee11b33fed5c7a94a91415fa846705f7dd3 (diff) | |
download | rails-12118963acacc9c869bdd41ef8480a1a4e06d358.tar.gz rails-12118963acacc9c869bdd41ef8480a1a4e06d358.tar.bz2 rails-12118963acacc9c869bdd41ef8480a1a4e06d358.zip |
use :en as a default locale (in favor of :en-US)
Signed-off-by: David Heinemeier Hansson <david@loudthinking.com>
Diffstat (limited to 'actionpack/test/template/translation_helper_test.rb')
-rw-r--r-- | actionpack/test/template/translation_helper_test.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/actionpack/test/template/translation_helper_test.rb b/actionpack/test/template/translation_helper_test.rb index 1b28a59288..d0d65cb450 100644 --- a/actionpack/test/template/translation_helper_test.rb +++ b/actionpack/test/template/translation_helper_test.rb @@ -10,12 +10,12 @@ class TranslationHelperTest < Test::Unit::TestCase end def test_delegates_to_i18n_setting_the_raise_option - I18n.expects(:translate).with(:foo, :locale => 'en-US', :raise => true) - translate :foo, :locale => 'en-US' + I18n.expects(:translate).with(:foo, :locale => 'en', :raise => true) + translate :foo, :locale => 'en' end def test_returns_missing_translation_message_wrapped_into_span - expected = '<span class="translation_missing">en-US, foo</span>' + expected = '<span class="translation_missing">en, foo</span>' assert_equal expected, translate(:foo) end |