use :en as a default locale (in favor of :en-US)

Signed-off-by: David Heinemeier Hansson <david@loudthinking.com>

7 files changed, 44 insertions, 44 deletions

diff --git a/actionpack/lib/action_view.rb b/actionpack/lib/action_view.rb
index 7cd9b633ac..7b1d3f8e7c 100644
--- a/actionpack/lib/action_view.rb
+++ b/actionpack/lib/action_view.rb
@@ -43,7 +43,7 @@ require 'action_view/base'
 require 'action_view/partials'
 require 'action_view/template_error'
 
-I18n.load_path << "#{File.dirname(__FILE__)}/action_view/locale/en-US.yml"
+I18n.load_path << "#{File.dirname(__FILE__)}/action_view/locale/en.yml"
 
 require 'action_view/helpers'
 
diff --git a/actionpack/lib/action_view/helpers/date_helper.rb b/actionpack/lib/action_view/helpers/date_helper.rb
index 919c937444..22108dd99d 100644
--- a/actionpack/lib/action_view/helpers/date_helper.rb
+++ b/actionpack/lib/action_view/helpers/date_helper.rb
@@ -131,7 +131,7 @@ module ActionView
       # * <tt>:order</tt>             - Set to an array containing <tt>:day</tt>, <tt>:month</tt> and <tt>:year</tt> do
       #   customize the order in which the select fields are shown. If you leave out any of the symbols, the respective
       #   select will not be shown (like when you set <tt>:discard_xxx => true</tt>. Defaults to the order defined in
-      #   the respective locale (e.g. [:year, :month, :day] in the en-US locale that ships with Rails).
+      #   the respective locale (e.g. [:year, :month, :day] in the en locale that ships with Rails).
       # * <tt>:include_blank</tt>     - Include a blank option in every select field so it's possible to set empty
       #   dates.
       # * <tt>:default</tt>           - Set a default date if the affected date isn't set or is nil.
diff --git a/actionpack/lib/action_view/locale/en-US.yml b/actionpack/lib/action_view/locale/en.yml
index 818f2f93bd..002226fd9c 100644
--- a/actionpack/lib/action_view/locale/en-US.yml
+++ b/actionpack/lib/action_view/locale/en.yml
@@ -1,4 +1,4 @@
-"en-US":
+"en":
   number:
     # Used in number_with_delimiter()
     # These are also the defaults for 'currency', 'percentage', 'precision', and 'human'
diff --git a/actionpack/test/template/active_record_helper_i18n_test.rb b/actionpack/test/template/active_record_helper_i18n_test.rb
index 7ba9659814..7e6bf70706 100644
--- a/actionpack/test/template/active_record_helper_i18n_test.rb
+++ b/actionpack/test/template/active_record_helper_i18n_test.rb
@@ -10,37 +10,37 @@ class ActiveRecordHelperI18nTest < Test::Unit::TestCase
       @object_name = 'book'
       stubs(:content_tag).returns 'content_tag'
 
-      I18n.stubs(:t).with(:'header', :locale => 'en-US', :scope => [:activerecord, :errors, :template], :count => 1, :model => '').returns "1 error prohibited this  from being saved"
-      I18n.stubs(:t).with(:'body', :locale => 'en-US', :scope => [:activerecord, :errors, :template]).returns 'There were problems with the following fields:'
+      I18n.stubs(:t).with(:'header', :locale => 'en', :scope => [:activerecord, :errors, :template], :count => 1, :model => '').returns "1 error prohibited this  from being saved"
+      I18n.stubs(:t).with(:'body', :locale => 'en', :scope => [:activerecord, :errors, :template]).returns 'There were problems with the following fields:'
     end
 
     def test_error_messages_for_given_a_header_option_it_does_not_translate_header_message
-      I18n.expects(:translate).with(:'header', :locale => 'en-US', :scope => [:activerecord, :errors, :template], :count => 1, :model => '').never
-      error_messages_for(:object => @object, :header_message => 'header message', :locale => 'en-US')
+      I18n.expects(:translate).with(:'header', :locale => 'en', :scope => [:activerecord, :errors, :template], :count => 1, :model => '').never
+      error_messages_for(:object => @object, :header_message => 'header message', :locale => 'en')
     end
 
     def test_error_messages_for_given_no_header_option_it_translates_header_message
-      I18n.expects(:t).with(:'header', :locale => 'en-US', :scope => [:activerecord, :errors, :template], :count => 1, :model => '').returns 'header message'
+      I18n.expects(:t).with(:'header', :locale => 'en', :scope => [:activerecord, :errors, :template], :count => 1, :model => '').returns 'header message'
       I18n.expects(:t).with('', :default => '', :count => 1, :scope => [:activerecord, :models]).once.returns ''
-      error_messages_for(:object => @object, :locale => 'en-US')
+      error_messages_for(:object => @object, :locale => 'en')
     end
 
     def test_error_messages_for_given_a_message_option_it_does_not_translate_message
-      I18n.expects(:t).with(:'body', :locale => 'en-US', :scope => [:activerecord, :errors, :template]).never
+      I18n.expects(:t).with(:'body', :locale => 'en', :scope => [:activerecord, :errors, :template]).never
       I18n.expects(:t).with('', :default => '', :count => 1, :scope => [:activerecord, :models]).once.returns ''
-      error_messages_for(:object => @object, :message => 'message', :locale => 'en-US')
+      error_messages_for(:object => @object, :message => 'message', :locale => 'en')
     end
 
     def test_error_messages_for_given_no_message_option_it_translates_message
-      I18n.expects(:t).with(:'body', :locale => 'en-US', :scope => [:activerecord, :errors, :template]).returns 'There were problems with the following fields:'
+      I18n.expects(:t).with(:'body', :locale => 'en', :scope => [:activerecord, :errors, :template]).returns 'There were problems with the following fields:'
       I18n.expects(:t).with('', :default => '', :count => 1, :scope => [:activerecord, :models]).once.returns ''
-      error_messages_for(:object => @object, :locale => 'en-US')
+      error_messages_for(:object => @object, :locale => 'en')
     end
     
     def test_error_messages_for_given_object_name_it_translates_object_name
-      I18n.expects(:t).with(:header, :locale => 'en-US', :scope => [:activerecord, :errors, :template], :count => 1, :model => @object_name).returns "1 error prohibited this #{@object_name} from being saved"
+      I18n.expects(:t).with(:header, :locale => 'en', :scope => [:activerecord, :errors, :template], :count => 1, :model => @object_name).returns "1 error prohibited this #{@object_name} from being saved"
       I18n.expects(:t).with(@object_name, :default => @object_name, :count => 1, :scope => [:activerecord, :models]).once.returns @object_name
-      error_messages_for(:object => @object, :locale => 'en-US', :object_name => @object_name)
+      error_messages_for(:object => @object, :locale => 'en', :object_name => @object_name)
     end
   end
 end
diff --git a/actionpack/test/template/date_helper_i18n_test.rb b/actionpack/test/template/date_helper_i18n_test.rb
index bf3b2588c8..dc9616db3b 100644
--- a/actionpack/test/template/date_helper_i18n_test.rb
+++ b/actionpack/test/template/date_helper_i18n_test.rb
@@ -41,11 +41,11 @@ class DateHelperDistanceOfTimeInWordsI18nTests < Test::Unit::TestCase
       key, count = *expected
       to = @from + diff
 
-      options = {:locale => 'en-US', :scope => :'datetime.distance_in_words'}
+      options = {:locale => 'en', :scope => :'datetime.distance_in_words'}
       options[:count] = count if count
 
       I18n.expects(:t).with(key, options)
-      distance_of_time_in_words(@from, to, include_seconds, :locale => 'en-US')
+      distance_of_time_in_words(@from, to, include_seconds, :locale => 'en')
     end
 
     def test_distance_of_time_pluralizations
@@ -78,36 +78,36 @@ class DateHelperSelectTagsI18nTests < Test::Unit::TestCase
 
   uses_mocha 'date_helper_select_tags_i18n_tests' do
     def setup
-      I18n.stubs(:translate).with(:'date.month_names', :locale => 'en-US').returns Date::MONTHNAMES
+      I18n.stubs(:translate).with(:'date.month_names', :locale => 'en').returns Date::MONTHNAMES
     end
 
     # select_month
 
     def test_select_month_given_use_month_names_option_does_not_translate_monthnames
       I18n.expects(:translate).never
-      select_month(8, :locale => 'en-US', :use_month_names => Date::MONTHNAMES)
+      select_month(8, :locale => 'en', :use_month_names => Date::MONTHNAMES)
     end
 
     def test_select_month_translates_monthnames
-      I18n.expects(:translate).with(:'date.month_names', :locale => 'en-US').returns Date::MONTHNAMES
-      select_month(8, :locale => 'en-US')
+      I18n.expects(:translate).with(:'date.month_names', :locale => 'en').returns Date::MONTHNAMES
+      select_month(8, :locale => 'en')
     end
 
     def test_select_month_given_use_short_month_option_translates_abbr_monthnames
-      I18n.expects(:translate).with(:'date.abbr_month_names', :locale => 'en-US').returns Date::ABBR_MONTHNAMES
-      select_month(8, :locale => 'en-US', :use_short_month => true)
+      I18n.expects(:translate).with(:'date.abbr_month_names', :locale => 'en').returns Date::ABBR_MONTHNAMES
+      select_month(8, :locale => 'en', :use_short_month => true)
     end
 
     # date_or_time_select
 
     def test_date_or_time_select_given_an_order_options_does_not_translate_order
       I18n.expects(:translate).never
-      datetime_select('post', 'updated_at', :order => [:year, :month, :day], :locale => 'en-US')
+      datetime_select('post', 'updated_at', :order => [:year, :month, :day], :locale => 'en')
     end
 
     def test_date_or_time_select_given_no_order_options_translates_order
-      I18n.expects(:translate).with(:'date.order', :locale => 'en-US').returns [:year, :month, :day]
-      datetime_select('post', 'updated_at', :locale => 'en-US')
+      I18n.expects(:translate).with(:'date.order', :locale => 'en').returns [:year, :month, :day]
+      datetime_select('post', 'updated_at', :locale => 'en')
     end
   end
 end
\ No newline at end of file
diff --git a/actionpack/test/template/number_helper_i18n_test.rb b/actionpack/test/template/number_helper_i18n_test.rb
index 2ee7f43a65..67c61a5f2e 100644
--- a/actionpack/test/template/number_helper_i18n_test.rb
+++ b/actionpack/test/template/number_helper_i18n_test.rb
@@ -13,42 +13,42 @@ class NumberHelperI18nTests < Test::Unit::TestCase
       @percentage_defaults = { :delimiter => '' }
       @precision_defaults = { :delimiter => '' }
 
-      I18n.backend.store_translations 'en-US', :number => { :format => @number_defaults,
+      I18n.backend.store_translations 'en', :number => { :format => @number_defaults,
         :currency => { :format => @currency_defaults }, :human => @human_defaults }
     end
 
     def test_number_to_currency_translates_currency_formats
-      I18n.expects(:translate).with(:'number.format', :locale => 'en-US', :raise => true).returns(@number_defaults)
-      I18n.expects(:translate).with(:'number.currency.format', :locale => 'en-US',
+      I18n.expects(:translate).with(:'number.format', :locale => 'en', :raise => true).returns(@number_defaults)
+      I18n.expects(:translate).with(:'number.currency.format', :locale => 'en',
                                     :raise => true).returns(@currency_defaults)
-      number_to_currency(1, :locale => 'en-US')
+      number_to_currency(1, :locale => 'en')
     end
 
     def test_number_with_precision_translates_number_formats
-      I18n.expects(:translate).with(:'number.format', :locale => 'en-US', :raise => true).returns(@number_defaults)
-      I18n.expects(:translate).with(:'number.precision.format', :locale => 'en-US',
+      I18n.expects(:translate).with(:'number.format', :locale => 'en', :raise => true).returns(@number_defaults)
+      I18n.expects(:translate).with(:'number.precision.format', :locale => 'en',
                                     :raise => true).returns(@precision_defaults)
-      number_with_precision(1, :locale => 'en-US')
+      number_with_precision(1, :locale => 'en')
     end
 
     def test_number_with_delimiter_translates_number_formats
-      I18n.expects(:translate).with(:'number.format', :locale => 'en-US', :raise => true).returns(@number_defaults)
-      number_with_delimiter(1, :locale => 'en-US')
+      I18n.expects(:translate).with(:'number.format', :locale => 'en', :raise => true).returns(@number_defaults)
+      number_with_delimiter(1, :locale => 'en')
     end
 
     def test_number_to_percentage_translates_number_formats
-      I18n.expects(:translate).with(:'number.format', :locale => 'en-US', :raise => true).returns(@number_defaults)
-      I18n.expects(:translate).with(:'number.percentage.format', :locale => 'en-US',
+      I18n.expects(:translate).with(:'number.format', :locale => 'en', :raise => true).returns(@number_defaults)
+      I18n.expects(:translate).with(:'number.percentage.format', :locale => 'en',
                                     :raise => true).returns(@percentage_defaults)
-      number_to_percentage(1, :locale => 'en-US')
+      number_to_percentage(1, :locale => 'en')
     end
 
     def test_number_to_human_size_translates_human_formats
-      I18n.expects(:translate).with(:'number.format', :locale => 'en-US', :raise => true).returns(@number_defaults)
-      I18n.expects(:translate).with(:'number.human.format', :locale => 'en-US',
+      I18n.expects(:translate).with(:'number.format', :locale => 'en', :raise => true).returns(@number_defaults)
+      I18n.expects(:translate).with(:'number.human.format', :locale => 'en',
                                     :raise => true).returns(@human_defaults)
       # can't be called with 1 because this directly returns without calling I18n.translate
-      number_to_human_size(1025, :locale => 'en-US')
+      number_to_human_size(1025, :locale => 'en')
     end
   end
 end
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