aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller.rb
diff options
context:
space:
mode:
authorSven Fuchs <svenfuchs@artweb-design.de>2008-09-09 23:19:07 +0200
committerDavid Heinemeier Hansson <david@loudthinking.com>2008-09-10 00:39:54 -0500
commita18ed6d5635f2d2a5d60e073757839895b1ade70 (patch)
tree57479d6e37ae69adb6ddfb24a8fd7b257d0ecf1c /actionpack/lib/action_controller.rb
parentc55565b032b4f383dcd43461d0bb7651f4d7e000 (diff)
downloadrails-a18ed6d5635f2d2a5d60e073757839895b1ade70.tar.gz
rails-a18ed6d5635f2d2a5d60e073757839895b1ade70.tar.bz2
rails-a18ed6d5635f2d2a5d60e073757839895b1ade70.zip
Added ActionController::Translation module delegating to I18n #translate/#t and #localize/#l [status:committed #1008]
Signed-off-by: David Heinemeier Hansson <david@loudthinking.com>
Diffstat (limited to 'actionpack/lib/action_controller.rb')
-rw-r--r--actionpack/lib/action_controller.rb2
1 files changed, 2 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