diff options
| -rw-r--r-- | app/models/public_body.rb | 8 | ||||
| -rw-r--r-- | app/models/user.rb | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/app/models/public_body.rb b/app/models/public_body.rb index 098e5e5e4..446ac2334 100644 --- a/app/models/public_body.rb +++ b/app/models/public_body.rb @@ -33,11 +33,11 @@ require 'set' class PublicBody < ActiveRecord::Base strip_attributes! - validates_presence_of :name - validates_presence_of :url_name + 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_uniqueness_of :short_name, :if => Proc.new { |pb| pb.short_name != "" } - validates_uniqueness_of :name + 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") has_many :info_requests, :order => 'created_at desc' has_many :track_things, :order => 'created_at desc' diff --git a/app/models/user.rb b/app/models/user.rb index 8c53c0d05..2fd6d9dbe 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -51,7 +51,7 @@ class User < ActiveRecord::Base validates_inclusion_of :admin_level, :in => [ 'none', 'super', - ] + ], :message => N_('Admin level is not included in list') acts_as_xapian :texts => [ :name, :about_me ], :values => [ |