From 5a30f567bebd97a7ba9b92c8677eb7301f50b160 Mon Sep 17 00:00:00 2001
From: Sven Fuchs <svenfuchs@artweb-design.de>
Date: Tue, 9 Sep 2008 23:19:07 +0200
Subject: [PATCH] include ActionController::Translation module delegating to I18n #translate/#t and #localize/#l

---
 actionpack/lib/action_controller.rb             |    2 +
 actionpack/lib/action_controller/translation.rb |   13 +++++++++++
 actionpack/test/controller/translation_test.rb  |   26 +++++++++++++++++++++++
 3 files changed, 41 insertions(+), 0 deletions(-)
 create mode 100644 actionpack/lib/action_controller/translation.rb
 create mode 100644 actionpack/test/controller/translation_test.rb

diff --git a/actionpack/lib/action_controller.rb b/actionpack/lib/action_controller.rb
index e58071d..2efd0da 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 0000000..9bb63cd
--- /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
diff --git a/actionpack/test/controller/translation_test.rb b/actionpack/test/controller/translation_test.rb
new file mode 100644
index 0000000..0bf61a6
--- /dev/null
+++ b/actionpack/test/controller/translation_test.rb
@@ -0,0 +1,26 @@
+require 'abstract_unit'
+
+# class TranslatingController < ActionController::Base
+# end
+
+class TranslationControllerTest < Test::Unit::TestCase
+  def setup
+    @controller = ActionController::Base.new
+  end
+  
+  def test_action_controller_base_responds_to_translate
+    assert @controller.respond_to?(:translate)
+  end
+  
+  def test_action_controller_base_responds_to_t
+    assert @controller.respond_to?(:t)
+  end
+  
+  def test_action_controller_base_responds_to_localize
+    assert @controller.respond_to?(:localize)
+  end
+  
+  def test_action_controller_base_responds_to_l
+    assert @controller.respond_to?(:l)
+  end
+end
\ No newline at end of file
-- 
1.5.3.7