From dff4ab9ca560350b796b1e3579147e7d8f748633 Mon Sep 17 00:00:00 2001 From: Jeremy Kemper Date: Wed, 19 Nov 2008 12:22:06 -0800 Subject: [PATCH] Reflect default locale change from en-US to en --- railties/test/initializer_test.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/railties/test/initializer_test.rb b/railties/test/initializer_test.rb index 9c045ed66a5d5..e09fd3d34ea0e 100644 --- a/railties/test/initializer_test.rb +++ b/railties/test/initializer_test.rb @@ -293,8 +293,8 @@ def test_config_defaults_and_settings_should_be_added_to_i18n_defaults Rails::Initializer.run(:initialize_i18n, config) assert_equal [ - "./test/../../activesupport/lib/active_support/locale/en-US.yml", - "./test/../../actionpack/lib/action_view/locale/en-US.yml", + File.expand_path("./test/../../activesupport/lib/active_support/locale/en.yml"), + File.expand_path("./test/../../actionpack/lib/action_view/locale/en.yml"), "my/test/locale.yml", "my/other/locale.yml" ], I18n.load_path end @@ -306,4 +306,4 @@ def test_setting_another_default_locale assert_equal :de, I18n.default_locale end end -end \ No newline at end of file +end