';
- if ($action != 'editlogin' && $action != 'editthirdparty')
+ if ($action != 'valid' && $action != 'editlogin' && $action != 'editthirdparty')
{
// Modify
if ($user->rights->adherent->creer)
diff --git a/htdocs/html.form.class.php b/htdocs/html.form.class.php
index cec34b94e0f..e7d379eb588 100644
--- a/htdocs/html.form.class.php
+++ b/htdocs/html.form.class.php
@@ -184,7 +184,7 @@ class Form
{
if ($type == 'info' || $type == 'help') return $text;
}
- // Info or help
+ // Info or help
if ($type == 'info') $img=img_help(0,$alt);
if ($type == 'help' || $type ==1) $img=img_help(1,$alt);
if ($type == 'superadmin') $img=img_redstar($alt);
@@ -1641,7 +1641,9 @@ class Form
$more.='
';
$more.='
'.$input['label'].' ';
$more.='
';
$more.='
';
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index f4e210c06f9..de41df9468a 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -821,7 +821,7 @@ MembersSetup=Members module setup
MemberMainOptions=Main options
AddSubscriptionIntoAccount=Add subscriptions into bank or cash account, of bank module
AdherentMailRequired=EMail required to create a new member
-MemberSendInformationByMailByDefault=Checkbox to send mail confirmation to members is on by default
+MemberSendInformationByMailByDefault=Checkbox to send mail confirmation to members (validation or new subscription) is on by default
##### LDAP setup #####
LDAPSetup=LDAP Setup
LDAPGlobalParameters=Global parameters
diff --git a/htdocs/langs/fr_FR/admin.lang b/htdocs/langs/fr_FR/admin.lang
index ac12b163622..82549e6a283 100644
--- a/htdocs/langs/fr_FR/admin.lang
+++ b/htdocs/langs/fr_FR/admin.lang
@@ -821,7 +821,7 @@ MembersSetup = Configuration du module Adhérents
MemberMainOptions = Options principales
AddSubscriptionIntoAccount = Enregistrer cotisations dans compte bancaire ou caisse, du module banque
AdherentMailRequired = EMail obligatoire pour créer un nouvel adhérent
-MemberSendInformationByMailByDefault = Case à cocher pour envoyer mail de confirmation aux adhérents est à oui par défaut
+MemberSendInformationByMailByDefault = Case à cocher pour envoyer mail de confirmation (validation ou nouvelle cotisation) aux adhérents est à oui par défaut
##### LDAP setup ##### = undefined
LDAPSetup = Configuration du module LDAP
LDAPGlobalParameters = Paramètres globals