diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2008-11-20 08:52:48 +0100 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2008-11-20 08:52:48 +0100 |
| commit | 206c5643aae40b0884d42fdb8caeb3f763936fa9 (patch) | |
| tree | 608f5cc7daab7b58b3d159429c595303e7e1c7d4 /railties/test | |
| parent | fb1eebac940d0648d1640d20a24f085d901d6f30 (diff) | |
| parent | 20a346170cf3922d16e265487cfb1abcc85383c1 (diff) | |
| download | rails-206c5643aae40b0884d42fdb8caeb3f763936fa9.tar.gz rails-206c5643aae40b0884d42fdb8caeb3f763936fa9.tar.bz2 rails-206c5643aae40b0884d42fdb8caeb3f763936fa9.zip | |
Merge branch 'master' of git@github.com:rails/rails
Diffstat (limited to 'railties/test')
| -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 |