diff options
| author | Louise Crow <louise.crow@gmail.com> | 2015-05-22 17:49:59 +0100 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2015-05-22 17:49:59 +0100 |
| commit | 15418b4f0aebb31643300e75c9c68e0e71a90560 (patch) | |
| tree | a1d061fac0994b39e99df570e14b29c8f088331b /app/controllers/request_controller.rb | |
| parent | 5116263e02fce228f9d1006945cb311829a7b586 (diff) | |
| parent | 7b2757e7be4ae2ddf0fa7cb694faf5799340f003 (diff) | |
Merge remote-tracking branch 'jpmckinney_github/parentheses' into rails-3-develop
Diffstat (limited to 'app/controllers/request_controller.rb')
| -rw-r--r-- | app/controllers/request_controller.rb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/app/controllers/request_controller.rb b/app/controllers/request_controller.rb index aa88aeeeb..bdb309dd8 100644 --- a/app/controllers/request_controller.rb +++ b/app/controllers/request_controller.rb @@ -75,7 +75,7 @@ class RequestController < ApplicationController else medium_cache end - @locale = self.locale_from_params() + @locale = locale_from_params I18n.with_locale(@locale) do # Look up by old style numeric identifiers @@ -164,7 +164,7 @@ class RequestController < ApplicationController def list medium_cache @view = params[:view] - @locale = self.locale_from_params() + @locale = locale_from_params @page = get_search_page_from_params if !@page # used in cache case, as perform_search sets @page as side effect @per_page = PER_PAGE @max_results = MAX_RESULTS @@ -848,7 +848,7 @@ class RequestController < ApplicationController # FOI officers can upload a response def upload_response - @locale = self.locale_from_params() + @locale = locale_from_params I18n.with_locale(@locale) do @info_request = InfoRequest.find_by_url_title!(params[:url_title]) @@ -914,7 +914,7 @@ class RequestController < ApplicationController end def download_entire_request - @locale = self.locale_from_params() + @locale = locale_from_params I18n.with_locale(@locale) do @info_request = InfoRequest.find_by_url_title!(params[:url_title]) if authenticated?( |