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

Translation + decode

Browse Source
This commit is contained in:
atm-lena 2020-08-27 16:03:25 +02:00
parent e3ce3cbb7c
commit c0f254d10c
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/comm/action/class/actioncomm.class.php
View File

@ -1979,7 +1979,7 @@ class ActionComm extends CommonObject
dol_syslog(__METHOD__, LOG_DEBUG); dol_syslog(__METHOD__, LOG_DEBUG);
//Select all action comm reminder //Select all action comm reminder
$sql = "SELECT rowid as id FROM ".MAIN_DB_PREFIX."actioncomm_reminder WHERE typeremind = 'email'"; $sql = "SELECT rowid as id FROM ".MAIN_DB_PREFIX."actioncomm_reminder WHERE typeremind = 'email' AND status = 0";
$resql = $this->db->query($sql); $resql = $this->db->query($sql);
if($resql){ if($resql){
@ -2013,7 +2013,7 @@ class ActionComm extends CommonObject
$sendContent = make_substitutions($langs->trans($arraymessage->content), $substitutionarray); $sendContent = make_substitutions($langs->trans($arraymessage->content), $substitutionarray);
//Topic //Topic
$sendTopic = (!empty($arraymessage->topic)) ? $arraymessage->topic : $langs->trans('EventReminder'); $sendTopic = (!empty($arraymessage->topic)) ? $arraymessage->topic : html_entity_decode($langs->trans('EventReminder'));
// Recipient // Recipient
$recipient = new User($this->db); $recipient = new User($this->db);

3
htdocs/langs/en_US/agenda.lang
View File

@ -165,4 +165,5 @@ TimeType=Duration type
ReminderType=Callback type ReminderType=Callback type
AddReminder=Create an automatic reminder notification for this event AddReminder=Create an automatic reminder notification for this event
ErrorReminderActionCommCreation=Error creating the reminder notification for this event ErrorReminderActionCommCreation=Error creating the reminder notification for this event
BrowserPush=Browser Notification BrowserPush=Browser Notification
EventReminder=Event Reminder

1
htdocs/langs/fr_FR/agenda.lang
View File

@ -164,3 +164,4 @@ ReminderType=Type de rappel
AddReminder=Créer une notification de rappel automatique pour cet évènement AddReminder=Créer une notification de rappel automatique pour cet évènement
ErrorReminderActionCommCreation=Erreur lors de la création de la notification de rappel de cet événement ErrorReminderActionCommCreation=Erreur lors de la création de la notification de rappel de cet événement
BrowserPush=Notification navigateur BrowserPush=Notification navigateur
EventReminder=Rappel événement