diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2008-11-19 12:22:06 -0800 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2008-11-19 12:22:06 -0800 |
| commit | 549388c244a87562030268689fdfc051c680ec0d (patch) | |
| tree | 0e676f7752a4817b6e936628161e03e35b0c2b29 /railties | |
| parent | 7ee9addb6edc6d231ab5d95a24964a56b0b175d0 (diff) | |
| download | rails-549388c244a87562030268689fdfc051c680ec0d.tar.gz rails-549388c244a87562030268689fdfc051c680ec0d.tar.bz2 rails-549388c244a87562030268689fdfc051c680ec0d.zip | |
Reflect default locale change from en-US to en
Diffstat (limited to 'railties')
| -rw-r--r-- | railties/test/initializer_test.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/railties/test/initializer_test.rb b/railties/test/initializer_test.rb index 9c045ed66a..e09fd3d34e 100644 --- a/railties/test/initializer_test.rb +++ b/railties/test/initializer_test.rb @@ -293,8 +293,8 @@ uses_mocha 'i18n settings' do 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 @@ uses_mocha 'i18n settings' do assert_equal :de, I18n.default_locale end end -end
\ No newline at end of file +end |