From 6e26be69606c52dbccfad366661b455157c35be4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Wed, 20 Jan 2010 14:41:23 +0100
Subject: [PATCH] Move ActionController::Translation to
 AbstractController::Translation.

---
 actionpack/lib/abstract_controller.rb                           | 1 +
 actionpack/lib/abstract_controller/rendering.rb                 | 2 +-
 .../{action_controller => abstract_controller}/translation.rb   | 2 +-
 actionpack/lib/action_controller.rb                             | 1 -
 actionpack/lib/action_controller/base.rb                        | 2 +-
 actionpack/test/{controller => abstract}/translation_test.rb    | 0
 6 files changed, 4 insertions(+), 4 deletions(-)
 rename actionpack/lib/{action_controller => abstract_controller}/translation.rb (88%)
 rename actionpack/test/{controller => abstract}/translation_test.rb (100%)

diff --git a/actionpack/lib/abstract_controller.rb b/actionpack/lib/abstract_controller.rb
index efc35a7e56..725d8fb8fc 100644
--- a/actionpack/lib/abstract_controller.rb
+++ b/actionpack/lib/abstract_controller.rb
@@ -15,5 +15,6 @@ module AbstractController
   autoload :LocalizedCache
   autoload :Logger
   autoload :Rendering
+  autoload :Translation
   autoload :UrlFor
 end
diff --git a/actionpack/lib/abstract_controller/rendering.rb b/actionpack/lib/abstract_controller/rendering.rb
index 644419a585..826e82c8c6 100644
--- a/actionpack/lib/abstract_controller/rendering.rb
+++ b/actionpack/lib/abstract_controller/rendering.rb
@@ -42,7 +42,7 @@ def view_context
     # Delegates render_to_body and sticks the result in self.response_body.
     def render(*args, &block)
       if response_body
-        raise AbstractController::DoubleRenderError, "Can only render or redirect once per action"
+        raise AbstractController::DoubleRenderError
       end
 
       options = _normalize_options(*args, &block)
diff --git a/actionpack/lib/action_controller/translation.rb b/actionpack/lib/abstract_controller/translation.rb
similarity index 88%
rename from actionpack/lib/action_controller/translation.rb
rename to actionpack/lib/abstract_controller/translation.rb
index 65e9eddb0a..6d68cf4944 100644
--- a/actionpack/lib/action_controller/translation.rb
+++ b/actionpack/lib/abstract_controller/translation.rb
@@ -1,4 +1,4 @@
-module ActionController
+module AbstractController
   module Translation
     def translate(*args)
       I18n.translate(*args)
diff --git a/actionpack/lib/action_controller.rb b/actionpack/lib/action_controller.rb
index 8bc2cc79d2..fa4a253ec1 100644
--- a/actionpack/lib/action_controller.rb
+++ b/actionpack/lib/action_controller.rb
@@ -8,7 +8,6 @@ module ActionController
   autoload :Base
   autoload :Caching
   autoload :PolymorphicRoutes
-  autoload :Translation
   autoload :Metal
   autoload :Middleware
 
diff --git a/actionpack/lib/action_controller/base.rb b/actionpack/lib/action_controller/base.rb
index 4f928e37ea..21a811c004 100644
--- a/actionpack/lib/action_controller/base.rb
+++ b/actionpack/lib/action_controller/base.rb
@@ -4,6 +4,7 @@ class Base < Metal
 
     include AbstractController::Callbacks
     include AbstractController::Layouts
+    include AbstractController::Translation
 
     include ActionController::Helpers
     helper :all # By default, all helpers should be included
@@ -33,7 +34,6 @@ class Base < Metal
     include ActionController::Streaming
     include ActionController::HttpAuthentication::Basic::ControllerMethods
     include ActionController::HttpAuthentication::Digest::ControllerMethods
-    include ActionController::Translation
 
     # Add instrumentations hooks at the bottom, to ensure they instrument
     # all the methods properly.
diff --git a/actionpack/test/controller/translation_test.rb b/actionpack/test/abstract/translation_test.rb
similarity index 100%
rename from actionpack/test/controller/translation_test.rb
rename to actionpack/test/abstract/translation_test.rb