Added ActionController::Translation module delegating to I18n #translate/#t and #localize/#l [status:committed #1008]

Signed-off-by: David Heinemeier Hansson <david@loudthinking.com>

2 files changed, 15 insertions, 0 deletions

diff --git a/actionpack/lib/action_controller.rb b/actionpack/lib/action_controller.rb
index e58071d4af..2efd0dad2e 100644
--- a/actionpack/lib/action_controller.rb
+++ b/actionpack/lib/action_controller.rb
@@ -54,6 +54,7 @@ require 'action_controller/rack_process'
 require 'action_controller/record_identifier'
 require 'action_controller/request_forgery_protection'
 require 'action_controller/headers'
+require 'action_controller/translation'
 
 require 'action_view'
 
@@ -74,4 +75,5 @@ ActionController::Base.class_eval do
   include ActionController::Components
   include ActionController::RecordIdentifier
   include ActionController::RequestForgeryProtection
+  include ActionController::Translation
 end
diff --git a/actionpack/lib/action_controller/translation.rb b/actionpack/lib/action_controller/translation.rb
new file mode 100644
index 0000000000..9bb63cdb15
--- /dev/null
+++ b/actionpack/lib/action_controller/translation.rb
@@ -0,0 +1,13 @@
+module ActionController
+  module Translation
+    def translate(*args)
+      I18n.translate *args
+    end
+    alias :t :translate
+
+    def localize(*args)
+      I18n.localize *args
+    end
+    alias :l :localize
+  end
+end
\ No newline at end of file