lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Qual: Interface is more clear.

Browse Source
This commit is contained in:
Laurent Destailleur 2012-09-05 19:35:04 +02:00
parent 7059cdb07a
commit aef1e29ad7
5 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/admin/mailing.php
View File

@ -127,7 +127,7 @@ print '</td></tr>';
$var=!$var; $var=!$var;
print '<tr '.$bc[$var].'><td>'; print '<tr '.$bc[$var].'><td>';
print $langs->trans("ActivateCheckRead").'</td><td>'; print $langs->trans("ActivateCheckRead").'</td><td>';
if ($conf->global->MAILING_EMAIL_UNSUBSCRIBE==1) if (!empty($conf->global->MAILING_EMAIL_UNSUBSCRIBE))
{ {
print '<a href="'.$_SERVER["PHP_SELF"].'?action=setvalue&value=off">'; print '<a href="'.$_SERVER["PHP_SELF"].'?action=setvalue&value=off">';
print img_picto($langs->trans("Enabled"),'switch_on'); print img_picto($langs->trans("Enabled"),'switch_on');

2
htdocs/admin/mails.php
View File

@ -41,7 +41,7 @@ $substitutionarrayfortest=array(
'__LASTNAME__' => 'TESTLastname', '__LASTNAME__' => 'TESTLastname',
'__FIRSTNAME__' => 'TESTFirstname', '__FIRSTNAME__' => 'TESTFirstname',
'__SIGNATURE__' => 'TESTSignature', '__SIGNATURE__' => 'TESTSignature',
'__PERSONALIZED__' => 'TESTPersonalized' //'__PERSONALIZED__' => 'TESTPersonalized' // Hiden because not used yet
); );
complete_substitutions_array($substitutionarrayfortest, $langs); complete_substitutions_array($substitutionarrayfortest, $langs);

16
htdocs/comm/mailing/fiche.php
View File

@ -57,22 +57,22 @@ $object->substitutionarray=array(
'__EMAIL__' => 'EMail', '__EMAIL__' => 'EMail',
'__LASTNAME__' => 'Lastname', '__LASTNAME__' => 'Lastname',
'__FIRSTNAME__' => 'Firstname', '__FIRSTNAME__' => 'Firstname',
'__MAILTOEMAIL__' => 'MailtoEmail', '__MAILTOEMAIL__' => 'TagMailtoEmail',
'__OTHER1__' => 'Other1', '__OTHER1__' => 'Other1',
'__OTHER2__' => 'Other2', '__OTHER2__' => 'Other2',
'__OTHER3__' => 'Other3', '__OTHER3__' => 'Other3',
'__OTHER4__' => 'Other4', '__OTHER4__' => 'Other4',
'__OTHER5__' => 'Other5', '__OTHER5__' => 'Other5',
'__SIGNATURE__' => 'Signature', '__SIGNATURE__' => 'TagSignature',
'__PERSONALIZED__' => 'Personalized' //'__PERSONALIZED__' => 'Personalized' // Hidden because not used yet
); );
if ($conf->global->MAILING_EMAIL_UNSUBSCRIBE) if (! empty($conf->global->MAILING_EMAIL_UNSUBSCRIBE))
{ {
$object->substitutionarray=array_merge( $object->substitutionarray=array_merge(
$object->substitutionarray, $object->substitutionarray,
array( array(
'__CHECK_READ__' => 'CheckMail', '__CHECK_READ__' => 'TagCheckMail',
'__UNSUBSCRIBE__' => 'Unsubscribe' '__UNSUBSCRIBE__' => 'TagUnsubscribe'
) )
); );
} }
@ -89,9 +89,9 @@ $object->substitutionarrayfortest=array(
'__OTHER4__' => 'TESTOther4', '__OTHER4__' => 'TESTOther4',
'__OTHER5__' => 'TESTOther5', '__OTHER5__' => 'TESTOther5',
'__SIGNATURE__' => 'TESTSignature', '__SIGNATURE__' => 'TESTSignature',
'__PERSONALIZED__' => 'TESTPersonalized' //'__PERSONALIZED__' => 'TESTPersonalized' // Not used yet
); );
if ($conf->global->MAILING_EMAIL_UNSUBSCRIBE) if (!empty($conf->global->MAILING_EMAIL_UNSUBSCRIBE))
{ {
$object->substitutionarrayfortest=array_merge( $object->substitutionarrayfortest=array_merge(
$object->substitutionarrayfortest, $object->substitutionarrayfortest,

6
htdocs/langs/en_US/mails.lang
View File

@ -77,7 +77,7 @@ MailingStatusRead=Read
CheckRead=Read Receipt CheckRead=Read Receipt
YourMailUnsubcribeOK=The email <b>%s</b> is correctly unsubcribe from mailing list YourMailUnsubcribeOK=The email <b>%s</b> is correctly unsubcribe from mailing list
MailtoEMail=Hyper link to email MailtoEMail=Hyper link to email
ActivateCheckRead=Activate Read receipt and unsubcribe tag ActivateCheckRead=Allow to use the Read receipt tracker and the unsubcribe link
ActivateCheckReadKey=Key use to encrypt URL use for Read Receipt and unsubcribe function ActivateCheckReadKey=Key use to encrypt URL use for Read Receipt and unsubcribe function
# Libelle des modules de liste de destinataires mailing # Libelle des modules de liste de destinataires mailing
@ -115,6 +115,10 @@ NbOfEMailingsReceived=Mass emailings received
IdRecord=ID record IdRecord=ID record
DeliveryReceipt=Delivery Receipt DeliveryReceipt=Delivery Receipt
YouCanUseCommaSeparatorForSeveralRecipients=You can use the <b>comma</b> separator to specify several recipients. YouCanUseCommaSeparatorForSeveralRecipients=You can use the <b>comma</b> separator to specify several recipients.
TagCheckMail=Tracker mail opened
TagUnsubscribe=Unsubscribe link
TagSignature=Signature sending user
TagMailtoEmail=Recipient EMail
# Module Notifications # Module Notifications
Notifications=Notifications Notifications=Notifications

6
htdocs/langs/fr_FR/mails.lang
View File

@ -77,7 +77,7 @@ MailingStatusRead=Lu
CheckRead=Accusé de lecture CheckRead=Accusé de lecture
YourMailUnsubcribeOK=L'adresse e-mail <b>%s</b> est bien désincrite de la liste. YourMailUnsubcribeOK=L'adresse e-mail <b>%s</b> est bien désincrite de la liste.
MailtoEMail=Ecrire a e-mail (lien) MailtoEMail=Ecrire a e-mail (lien)
ActivateCheckRead=Activer les tags d'accusé de lecture et de désincription ActivateCheckRead=Permettre l'utilisation du tracker d'accusé de lecture et du lien de désincription
ActivateCheckReadKey=Clef de sécurité utilisée pour l'encryption des URL utilisées dans les fonctions d'accusé de lecture et de désincription ActivateCheckReadKey=Clef de sécurité utilisée pour l'encryption des URL utilisées dans les fonctions d'accusé de lecture et de désincription
# Libelle des modules de liste de destinataires mailing # Libelle des modules de liste de destinataires mailing
@ -114,6 +114,10 @@ NbOfEMailingsReceived=EMailings de masse reçus
IdRecord=ID enregistrement IdRecord=ID enregistrement
DeliveryReceipt=Accusé de réception DeliveryReceipt=Accusé de réception
YouCanUseCommaSeparatorForSeveralRecipients=Vous pouvez utiliser le caractère de séparation <b>virgule</b> pour spécifier plusieurs destinataires. YouCanUseCommaSeparatorForSeveralRecipients=Vous pouvez utiliser le caractère de séparation <b>virgule</b> pour spécifier plusieurs destinataires.
TagCheckMail=Tracker ouverture mail
TagUnsubscribe=Lien désinscription mailing masse
TagSignature=Signature utilisateur émetteur
TagMailtoEmail=EMail destinataire
# Module Notifications # Module Notifications
Notifications=Notifications Notifications=Notifications