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/public_body_controller.rb | |
| parent | 5116263e02fce228f9d1006945cb311829a7b586 (diff) | |
| parent | 7b2757e7be4ae2ddf0fa7cb694faf5799340f003 (diff) | |
Merge remote-tracking branch 'jpmckinney_github/parentheses' into rails-3-develop
Diffstat (limited to 'app/controllers/public_body_controller.rb')
| -rw-r--r-- | app/controllers/public_body_controller.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/app/controllers/public_body_controller.rb b/app/controllers/public_body_controller.rb index b34c929f5..e9ce0359d 100644 --- a/app/controllers/public_body_controller.rb +++ b/app/controllers/public_body_controller.rb @@ -24,7 +24,7 @@ class PublicBodyController < ApplicationController redirect_to :url_name => MySociety::Format.simplify_url_part(params[:url_name], 'body'), :status => :moved_permanently return end - @locale = self.locale_from_params() + @locale = locale_from_params I18n.with_locale(@locale) do @public_body = PublicBody.find_by_url_name_with_historic(params[:url_name]) raise ActiveRecord::RecordNotFound.new("None found") if @public_body.nil? @@ -83,7 +83,7 @@ class PublicBodyController < ApplicationController @public_body = PublicBody.find_by_url_name_with_historic(params[:url_name]) raise ActiveRecord::RecordNotFound.new("None found") if @public_body.nil? - I18n.with_locale(self.locale_from_params()) do + I18n.with_locale(locale_from_params) do if params[:submitted_view_email] if verify_recaptcha flash.discard(:error) @@ -106,7 +106,7 @@ class PublicBodyController < ApplicationController @tag = params[:tag] - @locale = self.locale_from_params + @locale = locale_from_params underscore_locale = @locale.gsub '-', '_' underscore_default_locale = I18n.default_locale.to_s.gsub '-', '_' |