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/models | |
| parent | 4dec7290c10537ebcccba491ba5dddcefd81e43a (diff) | |
Set locale with I18n rather than through globalize
Conflicts:
app/controllers/general_controller.rb
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/public_body.rb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/app/models/public_body.rb b/app/models/public_body.rb index 6fe5cc3e5..199440a28 100644 --- a/app/models/public_body.rb +++ b/app/models/public_body.rb @@ -326,7 +326,7 @@ class PublicBody < ActiveRecord::Base # The "internal admin" is a special body for internal use. def PublicBody.internal_admin_body - PublicBody.with_locale(I18n.default_locale) do + I18n.with_locale(I18n.default_locale) do pb = PublicBody.find_by_url_name("internal_admin_authority") if pb.nil? pb = PublicBody.new( @@ -364,7 +364,7 @@ class PublicBody < ActiveRecord::Base # of updating them bodies_by_name = {} set_of_existing = Set.new() - PublicBody.with_locale(I18n.default_locale) do + I18n.with_locale(I18n.default_locale) do bodies = (tag.nil? || tag.empty?) ? PublicBody.find(:all) : PublicBody.find_by_tag(tag) for existing_body in bodies # Hide InternalAdminBody from import notes @@ -407,7 +407,7 @@ class PublicBody < ActiveRecord::Base if public_body = bodies_by_name[name] # Existing public body available_locales.each do |locale| - PublicBody.with_locale(locale) do + I18n.with_locale(locale) do changed = ActiveSupport::OrderedHash.new field_list.each do |field_name| localized_field_name = (locale.to_s == I18n.default_locale.to_s) ? field_name : "#{field_name}.#{locale}" @@ -442,7 +442,7 @@ class PublicBody < ActiveRecord::Base else # New public body public_body = PublicBody.new(:name=>"", :short_name=>"", :request_email=>"") available_locales.each do |locale| - PublicBody.with_locale(locale) do + I18n.with_locale(locale) do changed = ActiveSupport::OrderedHash.new field_list.each do |field_name| localized_field_name = (locale.to_s == I18n.default_locale.to_s) ? field_name : "#{field_name}.#{locale}" |