diff options
| author | José Valim <jose.valim@gmail.com> | 2010-01-20 14:41:23 +0100 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2010-01-20 15:02:13 +0100 |
| commit | 6e26be69606c52dbccfad366661b455157c35be4 (patch) | |
| tree | a93b713b2d89cbab601fabfe1c2f54e21415e673 /actionpack/lib/action_controller | |
| parent | 8e2fd54b19656a6edbd94f8707927d09e167e7fc (diff) | |
| download | rails-6e26be69606c52dbccfad366661b455157c35be4.tar.gz rails-6e26be69606c52dbccfad366661b455157c35be4.tar.bz2 rails-6e26be69606c52dbccfad366661b455157c35be4.zip | |
Move ActionController::Translation to AbstractController::Translation.
Diffstat (limited to 'actionpack/lib/action_controller')
| -rw-r--r-- | actionpack/lib/action_controller/base.rb | 2 | ||||
| -rw-r--r-- | actionpack/lib/action_controller/translation.rb | 13 |
2 files changed, 1 insertions, 14 deletions
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 @@ module ActionController 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 @@ module ActionController 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/lib/action_controller/translation.rb b/actionpack/lib/action_controller/translation.rb deleted file mode 100644 index 65e9eddb0a..0000000000 --- a/actionpack/lib/action_controller/translation.rb +++ /dev/null @@ -1,13 +0,0 @@ -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 |