diff options
| author | Pratik Naik <pratiknaik@gmail.com> | 2009-05-23 01:59:23 +0200 |
|---|---|---|
| committer | Pratik Naik <pratiknaik@gmail.com> | 2009-05-23 02:03:22 +0200 |
| commit | c90f613ad68253cb253bf47cb812f9e027c35d10 (patch) | |
| tree | 400254d8c4d854db1c7621be611d15e4aa30b4c6 /actionpack | |
| parent | 28dbeb3a643eeb35767df55ed579f54438c3ee18 (diff) | |
| download | rails-c90f613ad68253cb253bf47cb812f9e027c35d10.tar.gz rails-c90f613ad68253cb253bf47cb812f9e027c35d10.tar.bz2 rails-c90f613ad68253cb253bf47cb812f9e027c35d10.zip | |
Add Translation to the new base
Diffstat (limited to 'actionpack')
| -rw-r--r-- | actionpack/lib/action_controller/new_base.rb | 1 | ||||
| -rw-r--r-- | actionpack/lib/action_controller/new_base/base.rb | 1 | ||||
| -rw-r--r-- | actionpack/test/new_base/abstract_unit.rb | 3 |
3 files changed, 5 insertions, 0 deletions
diff --git a/actionpack/lib/action_controller/new_base.rb b/actionpack/lib/action_controller/new_base.rb index d6107d3653..ad0e07e261 100644 --- a/actionpack/lib/action_controller/new_base.rb +++ b/actionpack/lib/action_controller/new_base.rb @@ -34,6 +34,7 @@ module ActionController autoload :Streaming, 'action_controller/base/streaming' autoload :HttpAuthentication, 'action_controller/base/http_authentication' autoload :FilterParameterLogging, 'action_controller/base/filter_parameter_logging' + autoload :Translation, 'action_controller/translation' require 'action_controller/routing' end diff --git a/actionpack/lib/action_controller/new_base/base.rb b/actionpack/lib/action_controller/new_base/base.rb index 6340b7fde9..85354bfea3 100644 --- a/actionpack/lib/action_controller/new_base/base.rb +++ b/actionpack/lib/action_controller/new_base/base.rb @@ -34,6 +34,7 @@ module ActionController include ActionController::HttpAuthentication::Basic::ControllerMethods include ActionController::HttpAuthentication::Digest::ControllerMethods include ActionController::FilterParameterLogging + include ActionController::Translation # TODO: Extract into its own module # This should be moved together with other normalizing behavior diff --git a/actionpack/test/new_base/abstract_unit.rb b/actionpack/test/new_base/abstract_unit.rb index 0b71488bd6..5df2576916 100644 --- a/actionpack/test/new_base/abstract_unit.rb +++ b/actionpack/test/new_base/abstract_unit.rb @@ -10,7 +10,10 @@ $stderr.puts "Running old tests on new_base" require 'test/unit' require 'active_support' + +# TODO : Revisit requiring all the core extensions here require 'active_support/core_ext' + require 'active_support/test_case' require 'action_controller/abstract' require 'action_controller/new_base' |