3 files changed, 22 insertions, 0 deletions
diff --git a/railties/lib/rails/configuration.rb b/railties/lib/rails/configuration.rb
index 5cc4f80684..2b362a9c50 100644
--- a/railties/lib/rails/configuration.rb
+++ b/railties/lib/rails/configuration.rb
@@ -109,6 +109,7 @@ module Rails
 
     # TODO: Fix this when there is an application object
     def middleware
+      require 'action_controller'
       ActionController::Dispatcher.middleware
     end
 
diff --git a/railties/lib/rails/plugin.rb b/railties/lib/rails/plugin.rb
index 49ec5c7fba..1c0af6411a 100644
--- a/railties/lib/rails/plugin.rb
+++ b/railties/lib/rails/plugin.rb
@@ -71,6 +71,10 @@ module Rails
       File.exist?(routing_file)
     end
 
+    # Returns true if there is any localization file in locale_path
+    def localized?
+      locale_files.any?
+    end
 
     def view_path
       File.join(directory, 'app', 'views')
@@ -87,6 +91,14 @@ module Rails
     def routing_file
       File.join(directory, 'config', 'routes.rb')
     end
+
+    def locale_path
+      File.join(directory, 'config', 'locales')
+    end
+
+    def locale_files
+      Dir[ File.join(locale_path, '*.{rb,yml}') ]
+    end
     
 
     private
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