diff options
| author | Carl Lerche <carllerche@mac.com> | 2009-09-01 12:19:09 -0700 |
|---|---|---|
| committer | Carl Lerche <carllerche@mac.com> | 2009-09-01 12:19:09 -0700 |
| commit | 016b1d3596ce12367edac8bb442f5c630a453ecf (patch) | |
| tree | 49435918ebb372f617c3cc95bc495f6dd5c12d24 /railties/lib/rails/plugin | |
| parent | 22d5e3d89d619acb9179dfcdd33f1afaee9567ca (diff) | |
| parent | da636809daca9c338200811d3590e446f57c8e81 (diff) | |
| download | rails-016b1d3596ce12367edac8bb442f5c630a453ecf.tar.gz rails-016b1d3596ce12367edac8bb442f5c630a453ecf.tar.bz2 rails-016b1d3596ce12367edac8bb442f5c630a453ecf.zip | |
Merge branch 'master' of git@github.com:rails/rails
Diffstat (limited to 'railties/lib/rails/plugin')
| -rw-r--r-- | railties/lib/rails/plugin/loader.rb | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/railties/lib/rails/plugin/loader.rb b/railties/lib/rails/plugin/loader.rb index 7ea9c7c0f3..0d16cbd7c3 100644 --- a/railties/lib/rails/plugin/loader.rb +++ b/railties/lib/rails/plugin/loader.rb @@ -73,6 +73,7 @@ module Rails def configure_engines if engines.any? add_engine_routing_configurations + add_engine_locales add_engine_controller_paths add_engine_view_paths end @@ -84,6 +85,14 @@ module Rails end end + def add_engine_locales + localized_engines = engines.select { |engine| engine.localized? } + + # reverse it such that the last engine can overwrite translations from the first, like with routes + locale_files = localized_engines.collect { |engine| engine.locale_files }.reverse.flatten + I18n.load_path += locale_files - I18n.load_path + end + def add_engine_controller_paths ActionController::Routing.controller_paths += engines.collect {|engine| engine.controller_path } end |