From c0f254d10c675c8d34deed2971438683359c24b0 Mon Sep 17 00:00:00 2001 From: atm-lena Date: Thu, 27 Aug 2020 16:03:25 +0200 Subject: [PATCH] Translation + decode --- htdocs/comm/action/class/actioncomm.class.php | 4 ++-- htdocs/langs/en_US/agenda.lang | 3 ++- htdocs/langs/fr_FR/agenda.lang | 1 + 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/htdocs/comm/action/class/actioncomm.class.php b/htdocs/comm/action/class/actioncomm.class.php index 54a7fd8e2f0..2f99eef15c9 100644 --- a/htdocs/comm/action/class/actioncomm.class.php +++ b/htdocs/comm/action/class/actioncomm.class.php @@ -1979,7 +1979,7 @@ class ActionComm extends CommonObject dol_syslog(__METHOD__, LOG_DEBUG); //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); if($resql){ @@ -2013,7 +2013,7 @@ class ActionComm extends CommonObject $sendContent = make_substitutions($langs->trans($arraymessage->content), $substitutionarray); //Topic - $sendTopic = (!empty($arraymessage->topic)) ? $arraymessage->topic : $langs->trans('EventReminder'); + $sendTopic = (!empty($arraymessage->topic)) ? $arraymessage->topic : html_entity_decode($langs->trans('EventReminder')); // Recipient $recipient = new User($this->db); diff --git a/htdocs/langs/en_US/agenda.lang b/htdocs/langs/en_US/agenda.lang index bbfb143cee8..7b716d8050d 100644 --- a/htdocs/langs/en_US/agenda.lang +++ b/htdocs/langs/en_US/agenda.lang @@ -165,4 +165,5 @@ TimeType=Duration type ReminderType=Callback type AddReminder=Create an automatic reminder notification for this event ErrorReminderActionCommCreation=Error creating the reminder notification for this event -BrowserPush=Browser Notification \ No newline at end of file +BrowserPush=Browser Notification +EventReminder=Event Reminder \ No newline at end of file diff --git a/htdocs/langs/fr_FR/agenda.lang b/htdocs/langs/fr_FR/agenda.lang index 80d1c953e0b..e53af5f75be 100644 --- a/htdocs/langs/fr_FR/agenda.lang +++ b/htdocs/langs/fr_FR/agenda.lang @@ -164,3 +164,4 @@ ReminderType=Type de rappel 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 BrowserPush=Notification navigateur +EventReminder=Rappel événement