From 679fe485123ae90fcb2c4d65258376f755565746 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Fri, 1 Jul 2005 22:23:35 +0000
Subject: [PATCH] Trad: Encore de la traduction

---
 htdocs/langs/en_US/users.lang |  1 +
 htdocs/langs/fr_FR/users.lang |  1 +
 htdocs/user.class.php         |  2 +-
 htdocs/user/fiche.php         | 13 ++++++++++---
 4 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/htdocs/langs/en_US/users.lang b/htdocs/langs/en_US/users.lang
index 7d89f877a7b..3655dd21d0c 100755
--- a/htdocs/langs/en_US/users.lang
+++ b/htdocs/langs/en_US/users.lang
@@ -31,6 +31,7 @@ SearchAGroup=Search a group
 SearchAUser=Search a user
 ErrorGroupAlreadyExists=Group %s already exists.
 ErrorLoginAlreadyExists=Login %s already exists.
+ErrorFailedToSendPassword=Failed to send password
 LoginNotDefined=Login is not defined.
 NameNotDefined=Name is not defined.
 ListOfUsers=List of users
diff --git a/htdocs/langs/fr_FR/users.lang b/htdocs/langs/fr_FR/users.lang
index a4bb69d356b..3ec7ff12e00 100755
--- a/htdocs/langs/fr_FR/users.lang
+++ b/htdocs/langs/fr_FR/users.lang
@@ -31,6 +31,7 @@ SearchAGroup=Rechercher un groupe
 SearchAUser=Rechercher un utilisateur
 ErrorLoginAlreadyExists=Le login %s existe déjà.
 ErrorGroupAlreadyExists=Le groupe %s existe déjà.
+ErrorFailedToSendPassword=Echec de l'envoi du mot de passe
 LoginNotDefined=Le login n'est pas défini.
 NameNotDefined=Le nom n'est pas défini.
 ListOfUsers=Liste des utilisateurs
diff --git a/htdocs/user.class.php b/htdocs/user.class.php
index bbbd4dba2cc..757bb68858a 100644
--- a/htdocs/user.class.php
+++ b/htdocs/user.class.php
@@ -754,7 +754,7 @@ class User
         }
         else
         {
-            $this->error=$langs->trans("ErrorFailtedToSendPassword");
+            $this->error=$langs->trans("ErrorFailedToSendPassword");
             return -1;
         }
     }
diff --git a/htdocs/user/fiche.php b/htdocs/user/fiche.php
index 4523916d854..fa91ff6448f 100644
--- a/htdocs/user/fiche.php
+++ b/htdocs/user/fiche.php
@@ -221,9 +221,16 @@ if (($_GET["action"] == 'password' || $_GET["action"] == 'passwordsend') && $use
         // Succes
         if ($_GET["action"] == 'passwordsend')
         {
-            $edituser->send_password($user,$newpassword);
-            $message = '<div class="ok">'.$langs->trans("PasswordChangedAndSentTo",$edituser->email).'</div>';
-            //$message.=$newpassword;
+            if ($edituser->send_password($user,$newpassword) > 0)
+            {
+                $message = '<div class="ok">'.$langs->trans("PasswordChangedAndSentTo",$edituser->email).'</div>';
+                //$message.=$newpassword;
+            }
+            else
+            {
+                $message = '<div class="ok">'.$langs->trans("PasswordChangedTo",$newpassword).'</div>';
+                $message.= '<div class="error">'.$edituser->error.'</div>';
+            }
         }
         else
         {