X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/88e048deea4a543ac3129e3a5f0b3b7b94160f35..c3254b7e93a1f276759faf2b825479aa2a006032:/app/models/user.rb diff --git a/app/models/user.rb b/app/models/user.rb index 42759dbd5..b3325e4eb 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -98,11 +98,11 @@ class User < ActiveRecord::Base :format => { :with => %r{\A[^\x00-\x1f\x7f\ufffe\uffff]*\z} } validates :display_name, :if => proc { |u| u.display_name_changed? }, :format => { :with => %r{\A[^#{INVALID_CHARS}]*\z}, - :message => "cannot contain invalid chars: #{INVALID_CHARS}", invalid_chars: INVALID_CHARS } + :message => I18n.t("users.account.invalid chars", invalid_chars: INVALID_CHARS) } validates :display_name, :if => proc { |u| u.display_name_changed? }, - :format => { :with => /\A\S/, :message => "has leading whitespace" } + :format => { :with => /\A\S/, :message => I18n.t("users.account.leading whitespace") } validates :display_name, :if => proc { |u| u.display_name_changed? }, - :format => { :with => /\S\z/, :message => "has trailing whitespace" } + :format => { :with => /\S\z/, :message => I18n.t("users.account.trailing whitespace") } validates :email, :presence => true, :confirmation => true validates :email, :if => proc { |u| u.email_changed? }, :uniqueness => { :case_sensitive => false }