diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2009-02-27 14:22:39 +0100 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2009-02-27 14:22:39 +0100 |
| commit | 6de83562f91028629bd24447aa521bc72ef8277a (patch) | |
| tree | ca6a56c6fa441054b82a039b4ab263182d77333a /railties | |
| parent | e2b925fa68203607fb4f9a9aa457c0435c969f9a (diff) | |
| download | rails-6de83562f91028629bd24447aa521bc72ef8277a.tar.gz rails-6de83562f91028629bd24447aa521bc72ef8277a.tar.bz2 rails-6de83562f91028629bd24447aa521bc72ef8277a.zip | |
Force all internal calls to Array#to_sentence to use English [#2010 state:resolved]
Diffstat (limited to 'railties')
| -rw-r--r-- | railties/lib/rails/plugin/loader.rb | 2 | ||||
| -rw-r--r-- | railties/lib/tasks/testing.rake | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/railties/lib/rails/plugin/loader.rb b/railties/lib/rails/plugin/loader.rb index 7f85bb8966..f86589a689 100644 --- a/railties/lib/rails/plugin/loader.rb +++ b/railties/lib/rails/plugin/loader.rb @@ -178,7 +178,7 @@ module Rails if explicit_plugin_loading_order? if configuration.plugins.detect {|plugin| plugin != :all && !loaded?(plugin) } missing_plugins = configuration.plugins - (plugins.map{|p| p.name.to_sym} + [:all]) - raise LoadError, "Could not locate the following plugins: #{missing_plugins.to_sentence}" + raise LoadError, "Could not locate the following plugins: #{missing_plugins.to_sentence(:locale => :en)}" end end end diff --git a/railties/lib/tasks/testing.rake b/railties/lib/tasks/testing.rake index 4242458672..fd5e52a05b 100644 --- a/railties/lib/tasks/testing.rake +++ b/railties/lib/tasks/testing.rake @@ -48,7 +48,7 @@ task :test do task end end.compact - abort "Errors running #{errors.to_sentence}!" if errors.any? + abort "Errors running #{errors.to_sentence(:locale => :en)}!" if errors.any? end namespace :test do |