diff options
| author | wycats <wycats@gmail.com> | 2010-03-10 13:28:52 -0800 |
|---|---|---|
| committer | wycats <wycats@gmail.com> | 2010-03-10 13:28:52 -0800 |
| commit | 4745b53bcda400cf2e8cb4f2c0bf068f6d13c0e5 (patch) | |
| tree | 6f080f704435d22dbfee6ffd454529c12e5bb505 /actionpack/lib/abstract_controller/view_paths.rb | |
| parent | 7b622786fcc5046a06989ec7a3cbf46f92e04dea (diff) | |
| parent | 84f6da45a19d335be320991cab44f492f61dc5c7 (diff) | |
| download | rails-4745b53bcda400cf2e8cb4f2c0bf068f6d13c0e5.tar.gz rails-4745b53bcda400cf2e8cb4f2c0bf068f6d13c0e5.tar.bz2 rails-4745b53bcda400cf2e8cb4f2c0bf068f6d13c0e5.zip | |
Merge branch 'master' of github.com:rails/rails
Diffstat (limited to 'actionpack/lib/abstract_controller/view_paths.rb')
| -rw-r--r-- | actionpack/lib/abstract_controller/view_paths.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/actionpack/lib/abstract_controller/view_paths.rb b/actionpack/lib/abstract_controller/view_paths.rb index 6513c0778e..c2a9f6336d 100644 --- a/actionpack/lib/abstract_controller/view_paths.rb +++ b/actionpack/lib/abstract_controller/view_paths.rb @@ -7,7 +7,8 @@ module AbstractController self._view_paths = ActionView::PathSet.new end - delegate :template_exists?, :view_paths, :formats, :formats=, :to => :lookup_context + delegate :template_exists?, :view_paths, :formats, :formats=, + :locale, :locale=, :to => :lookup_context # LookupContext is the object responsible to hold all information required to lookup # templates, i.e. view paths and details. Check ActionView::LookupContext for more |