diff options
| -rw-r--r-- | activesupport/lib/active_support/railtie.rb | 4 | ||||
| -rw-r--r-- | railties/lib/rails/engine.rb | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/activesupport/lib/active_support/railtie.rb b/activesupport/lib/active_support/railtie.rb index c8d8b85000..58d11585ba 100644 --- a/activesupport/lib/active_support/railtie.rb +++ b/activesupport/lib/active_support/railtie.rb @@ -33,7 +33,7 @@ module I18n railtie_name :i18n # Initialize I18n load paths to an array - config.i18n.engines_load_path = [] + config.i18n.railties_load_path = [] config.i18n.load_path = [] initializer "i18n.initialize" do @@ -49,7 +49,7 @@ module I18n config.after_initialize do |app| app.config.i18n.each do |setting, value| case setting - when :engines_load_path + when :railties_load_path app.config.i18n.load_path.unshift(*value) when :load_path I18n.load_path += value diff --git a/railties/lib/rails/engine.rb b/railties/lib/rails/engine.rb index efa11b466a..1696bb7b86 100644 --- a/railties/lib/rails/engine.rb +++ b/railties/lib/rails/engine.rb @@ -90,7 +90,7 @@ module Rails # I18n load paths are a special case since the ones added # later have higher priority. initializer :add_locales do - config.i18n.engines_load_path.concat(paths.config.locales.to_a) + config.i18n.railties_load_path.concat(paths.config.locales.to_a) end initializer :add_view_paths do |