diff options
| author | David Cabo <david@calibea.com> | 2011-10-13 00:31:56 +0200 |
|---|---|---|
| committer | David Cabo <david@calibea.com> | 2011-10-13 00:31:56 +0200 |
| commit | 6b19c36f114624d7e53be8edc9ee490ecd20d0b0 (patch) | |
| tree | 7741c3655fe5e3cbc90dd20a4626ac7acc1bf6b0 /app/models/public_body.rb | |
| parent | 6800b9ff3fc77aa441afbdb0b0196afbdd87d8b4 (diff) | |
| parent | e13127a8ebc8bf8379d92f778af5a2bb6931d80c (diff) | |
Merge branch 'release/0.4' into develop
Diffstat (limited to 'app/models/public_body.rb')
| -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 311e19001..ab836657b 100644 --- a/app/models/public_body.rb +++ b/app/models/public_body.rb @@ -378,7 +378,7 @@ class PublicBody < ActiveRecord::Base next if name.nil? name.strip! - email.strip! + email.strip! unless email.nil? if !email.nil? && !email.empty? && !MySociety::Validate.is_valid_email(email) errors.push "error: line #{line.to_s}: invalid email '#{email}' for authority '#{name}'" @@ -392,7 +392,7 @@ class PublicBody < ActiveRecord::Base PublicBody.with_locale(locale) do changed = {} field_list.each do |field_name| - localized_field_name = (locale === I18n.default_locale) ? field_name : "#{field_name}.#{locale}" + localized_field_name = (locale.to_s == I18n.default_locale.to_s) ? field_name : "#{field_name}.#{locale}" localized_value = field_names[localized_field_name] && row[field_names[localized_field_name]] # Tags are a special case, as we support adding to the field, not just setting a new value @@ -422,12 +422,12 @@ class PublicBody < ActiveRecord::Base end end else # New public body - public_body = PublicBody.new(:name=>name, :short_name=>"", :request_email=>"") + public_body = PublicBody.new(:name=>"", :short_name=>"", :request_email=>"") available_locales.each do |locale| PublicBody.with_locale(locale) do changed = {} field_list.each do |field_name| - localized_field_name = (locale === I18n.default_locale) ? field_name : "#{field_name}.#{locale}" + localized_field_name = (locale.to_s == I18n.default_locale.to_s) ? field_name : "#{field_name}.#{locale}" localized_value = field_names[localized_field_name] && row[field_names[localized_field_name]] if localized_field_name == 'tag_string' and tag_behaviour == 'add' |