diff options
| author | Matthew Landauer <matthew@openaustralia.org> | 2013-01-17 05:26:54 +1100 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2013-04-02 15:48:06 +0100 |
| commit | 5d22285eef67627c58320f031d03d2bffd0ba55e (patch) | |
| tree | 1893ffa86b52dacad9d606d0d392c78c13e69a0f /app/controllers/admin_public_body_controller.rb | |
| parent | 4dec7290c10537ebcccba491ba5dddcefd81e43a (diff) | |
Set locale with I18n rather than through globalize
Conflicts:
app/controllers/general_controller.rb
Diffstat (limited to 'app/controllers/admin_public_body_controller.rb')
| -rw-r--r-- | app/controllers/admin_public_body_controller.rb | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/app/controllers/admin_public_body_controller.rb b/app/controllers/admin_public_body_controller.rb index bb5e98852..93715d364 100644 --- a/app/controllers/admin_public_body_controller.rb +++ b/app/controllers/admin_public_body_controller.rb @@ -14,7 +14,7 @@ class AdminPublicBodyController < AdminController def _lookup_query_internal @locale = self.locale_from_params() - PublicBody.with_locale(@locale) do + I18n.with_locale(@locale) do @query = params[:query] if @query == "" @query = nil @@ -75,7 +75,7 @@ class AdminPublicBodyController < AdminController def show @locale = self.locale_from_params() - PublicBody.with_locale(@locale) do + I18n.with_locale(@locale) do @public_body = PublicBody.find(params[:id]) render end @@ -87,7 +87,7 @@ class AdminPublicBodyController < AdminController end def create - PublicBody.with_locale(I18n.default_locale) do + I18n.with_locale(I18n.default_locale) do params[:public_body][:last_edit_editor] = admin_current_user() @public_body = PublicBody.new(params[:public_body]) if @public_body.save @@ -106,7 +106,7 @@ class AdminPublicBodyController < AdminController end def update - PublicBody.with_locale(I18n.default_locale) do + I18n.with_locale(I18n.default_locale) do params[:public_body][:last_edit_editor] = admin_current_user() @public_body = PublicBody.find(params[:id]) if @public_body.update_attributes(params[:public_body]) @@ -120,7 +120,7 @@ class AdminPublicBodyController < AdminController def destroy @locale = self.locale_from_params() - PublicBody.with_locale(@locale) do + I18n.with_locale(@locale) do public_body = PublicBody.find(params[:id]) if public_body.info_requests.size > 0 |