From 12118963acacc9c869bdd41ef8480a1a4e06d358 Mon Sep 17 00:00:00 2001
From: Sven Fuchs <svenfuchs@artweb-design.de>
Date: Tue, 18 Nov 2008 09:59:46 +0100
Subject: use :en as a default locale (in favor of :en-US)

Signed-off-by: David Heinemeier Hansson <david@loudthinking.com>
---
 actionpack/test/template/translation_helper_test.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'actionpack/test/template/translation_helper_test.rb')

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
   
-- 
cgit v1.2.3