mirror of
https://github.com/rails/rails.git
synced 2022-11-09 12:12:34 -05:00
Added ActionController::Translation module delegating to I18n #translate/#t and #localize/#l [status:committed #1008]
Signed-off-by: David Heinemeier Hansson <david@loudthinking.com>
This commit is contained in:
parent
c55565b032
commit
a18ed6d563
3 changed files with 41 additions and 0 deletions
|
@ -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
|
||||
|
|
13
actionpack/lib/action_controller/translation.rb
Normal file
13
actionpack/lib/action_controller/translation.rb
Normal file
|
@ -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
|
26
actionpack/test/controller/translation_test.rb
Normal file
26
actionpack/test/controller/translation_test.rb
Normal file
|
@ -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
|
Loading…
Reference in a new issue