From 3683ca294e94675590557b1fb45663608c23598c Mon Sep 17 00:00:00 2001 From: Carlos Purificacao Date: Thu, 9 Jul 2015 20:34:42 -0300 Subject: [PATCH] Added user unique validation message. --- app/models/user.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/models/user.rb b/app/models/user.rb index 4b28f12..638d559 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -101,7 +101,8 @@ class User < ActiveRecord::Base validates_confirmation_of :password, :if => :password_required? validates_length_of :login, :within => 2..40, :if => (lambda {|user| !user.login.blank?}) validates_length_of :email, :within => 3..100, :if => (lambda {|user| !user.email.blank?}) - validates_uniqueness_of :login, :email, :case_sensitive => false, :scope => :environment_id + validates_uniqueness_of :login, :message => _('login already taken') + validates_uniqueness_of :email, :case_sensitive => false, :scope => :environment_id before_save :encrypt_password before_save :normalize_email, if: proc{ |u| u.email.present? } validates_format_of :email, :with => Noosfero::Constants::EMAIL_FORMAT, :if => (lambda {|user| !user.email.blank?}) -- libgit2 0.21.2