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/general_controller.rb | |
| parent | 4dec7290c10537ebcccba491ba5dddcefd81e43a (diff) | |
Set locale with I18n rather than through globalize
Conflicts:
app/controllers/general_controller.rb
Diffstat (limited to 'app/controllers/general_controller.rb')
| -rw-r--r-- | app/controllers/general_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/general_controller.rb b/app/controllers/general_controller.rb index f6a46458e..0783fc579 100644 --- a/app/controllers/general_controller.rb +++ b/app/controllers/general_controller.rb @@ -25,7 +25,7 @@ class GeneralController < ApplicationController @locale = self.locale_from_params() locale_condition = 'public_body_translations.locale = ?' conditions = [locale_condition, @locale] - PublicBody.with_locale(@locale) do + I18n.with_locale(@locale) do if body_short_names.empty? # This is too slow @popular_bodies = PublicBody.visible.find(:all, |