diff --git a/htdocs/adherents/fiche.php b/htdocs/adherents/fiche.php
index d5ab221ce70..26c2321dd1d 100644
--- a/htdocs/adherents/fiche.php
+++ b/htdocs/adherents/fiche.php
@@ -1378,11 +1378,12 @@ if ($rowid && $action != 'edit')
}
// Envoi fiche par mail
- if ($adh->statut >= 1 && $adh->email)
+ if ($adh->statut >= 1)
{
if ($user->rights->adherent->creer)
{
- print "id&action=sendinfo\">".$langs->trans("SendCardByMail")."\n";
+ if ($adh->email) print "id&action=sendinfo\">".$langs->trans("SendCardByMail")."\n";
+ else print "trans("NoEMail"))."\">".$langs->trans("SendCardByMail")."\n";
}
else
{
@@ -1447,11 +1448,11 @@ if ($rowid && $action != 'edit')
$isinspip=$adh->is_in_spip();
if ($isinspip == 1)
{
- print "id&action=del_spip\">Suppression dans Spip\n";
+ print "id&action=del_spip\">".$langs->trans("DeleteIntoSpip")."\n";
}
if ($isinspip == 0)
{
- print "id&action=add_spip\">Ajout dans Spip\n";
+ print "id&action=add_spip\">".$langs->trans("AddIntoSpip")."\n";
}
if ($isinspip == -1) {
print '
Failed to connect to SPIP: '.$adh->error.'';
diff --git a/htdocs/langs/en_US/members.lang b/htdocs/langs/en_US/members.lang
index 7c3c0c0b8bf..a8fdfa9fc33 100644
--- a/htdocs/langs/en_US/members.lang
+++ b/htdocs/langs/en_US/members.lang
@@ -85,7 +85,7 @@ SubscriptionNotReceived=Subscription never received
SubscriptionLateShort=Late
SubscriptionNotReceivedShort=Never received
ListOfSubscriptions=List of subscriptions
-SendCardByMail=Send card
+SendCardByMail=Send card by Email
AddMember=Add member
MemberType=Member type
NoTypeDefinedGoToSetup=No member types defined. Go to setup - Members types
diff --git a/htdocs/langs/fr_FR/members.lang b/htdocs/langs/fr_FR/members.lang
index c348403096b..c036413c7c2 100644
--- a/htdocs/langs/fr_FR/members.lang
+++ b/htdocs/langs/fr_FR/members.lang
@@ -85,7 +85,7 @@ SubscriptionNotReceived=Cotisation non reçue
SubscriptionLateShort=En retard
SubscriptionNotReceivedShort=Non reçue
ListOfSubscriptions=Liste des cotisations
-SendCardByMail=Envoyer fiche
+SendCardByMail=Envoyer fiche par mail
AddMember=Ajouter adhérent
MemberType=Type d'adhérent
NoTypeDefinedGoToSetup=Aucun type d'adhérent défini. Allez dans Configuration -> Types d'adhérents
diff --git a/htdocs/user/fiche.php b/htdocs/user/fiche.php
index 5f0427463cd..a3da7a45a8a 100644
--- a/htdocs/user/fiche.php
+++ b/htdocs/user/fiche.php
@@ -111,10 +111,10 @@ if ($_REQUEST["action"] == 'confirm_enable' && $_REQUEST["confirm"] == "yes")
if ($_GET["id"] <> $user->id)
{
$message='';
-
+
$edituser = new User($db);
$edituser->fetch($_GET["id"]);
-
+
if (!empty($conf->file->main_limit_users))
{
$nb = $edituser->getNbOfUsers(1);
@@ -165,9 +165,9 @@ if ($_POST["action"] == 'add' && $canadduser)
$message='