From 88faac2bbbe3c493405080d58676bbf3f810c1f0 Mon Sep 17 00:00:00 2001
From: Daniela Soares Feitosa <danielafeitosa@colivre.coop.br>
Date: Wed, 31 Oct 2012 00:38:52 -0200
Subject: [PATCH] Added prettier error messages on password recovery

---
 app/models/change_password.rb           | 10 ++++------
 app/views/account/forgot_password.rhtml |  2 +-
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/app/models/change_password.rb b/app/models/change_password.rb
index 4544ccd..d77e02d 100644
--- a/app/models/change_password.rb
+++ b/app/models/change_password.rb
@@ -7,7 +7,7 @@ class ChangePassword < Task
     when :login:
       _('Username')
     when :email
-      _('e-Mail')
+      _('e-mail')
     when :password
       _('Password')
     when :password_confirmation
@@ -20,9 +20,7 @@ class ChangePassword < Task
   ###################################################
   # validations for creating a ChangePassword task 
   
-  validates_presence_of :login, :email, :environment_id, :on => :create
-
-  validates_presence_of :requestor_id
+  validates_presence_of :login, :email, :environment_id, :on => :create, :message => _('must be filled in')
 
   validates_format_of :email, :on => :create, :with => Noosfero::Constants::EMAIL_FORMAT, :if => (lambda { |obj| !obj.email.blank? })
 
@@ -30,10 +28,10 @@ class ChangePassword < Task
     unless data.login.blank? || data.email.blank?
       user = User.find_by_login_and_environment_id(data.login, data.environment_id)
       if user.nil? 
-        data.errors.add(:login, _('%{fn} is not a valid username.').fix_i18n)
+        data.errors.add(:login, _('is invalid or user does not exists.'))
       else
         if user.email != data.email
-          data.errors.add(:email)
+          data.errors.add(:email, _('does not match the username you filled in'))
         end
       end
     end
diff --git a/app/views/account/forgot_password.rhtml b/app/views/account/forgot_password.rhtml
index a95e464..537c9f4 100644
--- a/app/views/account/forgot_password.rhtml
+++ b/app/views/account/forgot_password.rhtml
@@ -1,6 +1,6 @@
 <h1><%= _('Forgot your password?') %></h1>
 
-<%= error_messages_for :change_password %>
+<%= error_messages_for :change_password, :header_message => _('Instructions to password recovery could not be sent'), :message => nil %>
 
 <% labelled_form_for :change_password, @change_password, :url => { :action => 'forgot_password' } do |f| %>
 
--
libgit2 0.21.2