diff options
Diffstat (limited to 'app/models/public_body.rb')
| -rw-r--r-- | app/models/public_body.rb | 21 |
1 files changed, 15 insertions, 6 deletions
diff --git a/app/models/public_body.rb b/app/models/public_body.rb index 446ac2334..1a366db75 100644 --- a/app/models/public_body.rb +++ b/app/models/public_body.rb @@ -33,8 +33,8 @@ require 'set' class PublicBody < ActiveRecord::Base strip_attributes! - validates_presence_of :name, :message => N_("Name can't be blank") - validates_presence_of :url_name, :message => N_("URL name can't be blank") + validates_presence_of :name, :message => N_("can't be blank") + validates_presence_of :url_name, :message => N_("can't be blank") validates_uniqueness_of :short_name, :message => N_("Short name is already taken"), :if => Proc.new { |pb| pb.short_name != "" } validates_uniqueness_of :name, :message => N_("Name is already taken") @@ -44,6 +44,9 @@ class PublicBody < ActiveRecord::Base has_tag_string + translates :name, :short_name, :request_email, :url_name, :notes + translates :first_letter, :publication_scheme + # like find_by_url_name but also search historic url_name if none found def self.find_by_url_name_with_historic(name) found = PublicBody.find_all_by_url_name(name) @@ -67,7 +70,8 @@ class PublicBody < ActiveRecord::Base # Set the first letter, which is used for faster queries before_save(:set_first_letter) def set_first_letter - self.first_letter = self.name[0,1].upcase + # we use a regex to ensure it works with utf-8/multi-byte + self.first_letter = self.name.scan(/./mu)[0].upcase end def validate @@ -166,16 +170,21 @@ class PublicBody < ActiveRecord::Base # When name or short name is changed, also change the url name def short_name=(short_name) - write_attribute(:short_name, short_name) + + globalize.write(self.class.locale || I18n.locale, :short_name, short_name) + self[:short_name] = short_name self.update_url_name end + def name=(name) - write_attribute(:name, name) + globalize.write(self.class.locale || I18n.locale, :name, name) + self[:name] = name self.update_url_name end + def update_url_name url_name = MySociety::Format.simplify_url_part(self.short_or_long_name, 'body') - write_attribute(:url_name, url_name) + self.url_name = url_name end # Return the short name if present, or else long name def short_or_long_name |