diff --git a/htdocs/admin/adherent.php b/htdocs/admin/adherent.php index ebe51afd5d3..7c3058ee508 100644 --- a/htdocs/admin/adherent.php +++ b/htdocs/admin/adherent.php @@ -249,7 +249,7 @@ llxFooter('$Date$ - $Revision$'); function form_constantes($tableau) { global $db,$bc,$langs; - + $form = new Form($db); print ''; @@ -280,7 +280,7 @@ function form_constantes($tableau) // Affiche nom constante print '\n"; if ($const == 'ADHERENT_ETIQUETTE_TYPE') diff --git a/htdocs/langs/en_US/members.lang b/htdocs/langs/en_US/members.lang index 63b9498cf9f..7f3a2177250 100644 --- a/htdocs/langs/en_US/members.lang +++ b/htdocs/langs/en_US/members.lang @@ -129,6 +129,8 @@ AddSubscription=Add subscription ShowSubscription=Show subscription MemberModifiedInDolibarr=Member modified in Dolibarr SendAnEMailToMember=Send information email to member +DescADHERENT_AUTOREGISTER_MAIL_SUBJECT=EMail subject for member autosubscription +DescADHERENT_AUTOREGISTER_MAIL=EMail for member autosubscription DescADHERENT_MAIL_VALID_SUBJECT=EMail subject for member validation DescADHERENT_MAIL_VALID=EMail for member validation DescADHERENT_MAIL_COTIS_SUBJECT=EMail subject for subscription
'; - print $langs->trans("Desc".$const) != ("Desc".$const) ? $langs->trans("Desc".$const) : $obj->note; + print $langs->trans("Desc".$const) != ("Desc".$const) ? $langs->trans("Desc".$const) : ($obj->note?$obj->note:$const); print "