From dcd30e09741161a624c5fa2fbb1a6bfa2a931801 Mon Sep 17 00:00:00 2001
From: Thomas Citharel <tcit@tcit.fr>
Date: Fri, 11 Dec 2020 17:20:19 +0100
Subject: [PATCH] Fix translation keys missing into emails

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
---
 create_classic_poll.php         | 4 ++--
 create_date_poll.php            | 4 ++--
 locale/fr.json                  | 2 +-
 locale/fr_FR.json               | 2 +-
 tpl/part/vote_table_classic.tpl | 2 +-
 tpl/part/vote_table_date.tpl    | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/create_classic_poll.php b/create_classic_poll.php
index fc777c4..95daa0a 100644
--- a/create_classic_poll.php
+++ b/create_classic_poll.php
@@ -105,8 +105,8 @@ if (empty($form->title) || empty($form->admin_name) || (($config['use_smtp']) ?
             $message_admin .= sprintf(' :<br/><br/><a href="%1$s">%1$s</a>', Utils::getUrlSondage($admin_poll_id, true));
 
             if ($mailService->isValidEmail($form->admin_mail)) {
-                $mailService->send($form->admin_mail, '[' . NOMAPPLICATION . '][' . __('Mail', 'Author\'s message') . '] ' . __('Generic', 'Poll') . ': ' . $form->title, $message_admin);
-                $mailService->send($form->admin_mail, '[' . NOMAPPLICATION . '][' . __('Mail', 'For sending to the polled users') . '] ' . __('Generic', 'Poll') . ': ' . $form->title, $message);
+                $mailService->send($form->admin_mail, '[' . NOMAPPLICATION . '][' . __('Mail', 'Author\'s message') . '] ' . __('Generic', 'Poll') . ': ' . Utils::htmlEscape($form->title), $message_admin);
+                $mailService->send($form->admin_mail, '[' . NOMAPPLICATION . '][' . __('Mail', 'For sending to the polled users') . '] ' . __('Generic', 'Poll') . ': ' . Utils::htmlEscape($form->title), $message);
             }
         }
 
diff --git a/create_date_poll.php b/create_date_poll.php
index 0eb35e7..487ad70 100644
--- a/create_date_poll.php
+++ b/create_date_poll.php
@@ -234,8 +234,8 @@ switch ($step) {
             $message_admin = sprintf($message_admin, Utils::getUrlSondage($admin_poll_id, true));
 
             if ($mailService->isValidEmail($form->admin_mail)) {
-                $mailService->send($form->admin_mail, '[' . NOMAPPLICATION . '][' . __('Mail', 'Message for the author') . '] ' . __('Generic', 'Poll') . ': ' . $form->title, $message_admin);
-                $mailService->send($form->admin_mail, '[' . NOMAPPLICATION . '][' . __('Mail', 'Participant link') . '] ' . __('Generic', 'Poll') . ': ' . $form->title, $message);
+                $mailService->send($form->admin_mail, '[' . NOMAPPLICATION . '][' . __('Mail', 'Author\'s message') . '] ' . __('Generic', 'Poll') . ': ' . Utils::htmlEscape($form->title), $message_admin);
+                $mailService->send($form->admin_mail, '[' . NOMAPPLICATION . '][' . __('Mail', 'For sending to the polled users') . '] ' . __('Generic', 'Poll') . ': ' . Utils::htmlEscape($form->title), $message);
             }
         }
 
diff --git a/locale/fr.json b/locale/fr.json
index ca7d46f..30d0e70 100644
--- a/locale/fr.json
+++ b/locale/fr.json
@@ -306,7 +306,7 @@
       "Export to CSV": "Export Tableur (CSV)",
       "Initiator of the poll": "Auteur·rice du sondage",
       "No password": "Pas de mot de passe",
-      "Only votes are protected": "Seul les votes sont protégés",
+      "Only votes are protected": "Seuls les votes sont protégés",
       "Password protected": "Protégé par mot de passe",
       "Poll rules": "Permissions du sondage",
       "Print": "Imprimer",
diff --git a/locale/fr_FR.json b/locale/fr_FR.json
index 45dd4cb..e4a51e2 100644
--- a/locale/fr_FR.json
+++ b/locale/fr_FR.json
@@ -306,7 +306,7 @@
       "Export to CSV": "Export Tableur (CSV)",
       "Initiator of the poll": "Auteur·rice du sondage",
       "No password": "Pas de mot de passe",
-      "Only votes are protected": "Seul les votes sont protégés",
+      "Only votes are protected": "Seuls les votes sont protégés",
       "Password protected": "Protégé par mot de passe",
       "Poll rules": "Permissions du sondage",
       "Print": "Imprimer",
diff --git a/tpl/part/vote_table_classic.tpl b/tpl/part/vote_table_classic.tpl
index 35f78eb..2992737 100644
--- a/tpl/part/vote_table_classic.tpl
+++ b/tpl/part/vote_table_classic.tpl
@@ -146,7 +146,7 @@
                                 <i class="glyphicon glyphicon-pencil"></i><span class="sr-only">{__('Generic', 'Edit')}</span>
                             </a>
                             {if $admin}
-                                <a href="{poll_url id=$poll->id vote_id=$vote->uniqId}" class="btn btn-default btn-sm clipboard-url" data-toggle="popover" data-trigger="manual" title="{__('Poll results', 'Link to edit this particular line')}" data-content="{__('Poll results', 'Link to edit this particular line has been copied!')}">
+                                <a href="{poll_url id=$poll->id vote_id=$vote->uniqId}" class="btn btn-default btn-sm clipboard-url" data-toggle="popover" data-trigger="manual" title="{__('Poll results', 'Link to edit this particular line')}" data-content="{__('Poll results', 'Link to edit this particular line has been copied inside the clipboard!')}">
                                     <span class="btn-link glyphicon glyphicon-link"></span>
                                 </a>
                                 <a href="{poll_url id=$admin_poll_id admin=true action='delete_vote' action_value=$vote->id}"
diff --git a/tpl/part/vote_table_date.tpl b/tpl/part/vote_table_date.tpl
index 1584ef0..420026c 100644
--- a/tpl/part/vote_table_date.tpl
+++ b/tpl/part/vote_table_date.tpl
@@ -204,7 +204,7 @@
                                 <i class="glyphicon glyphicon-pencil"></i><span class="sr-only">{__('Generic', 'Edit')}</span>
                             </a>
                             {if $admin}
-                                <a href="{poll_url id=$poll->id vote_id=$vote->uniqId}" class="btn btn-default btn-sm clipboard-url" data-toggle="popover" data-trigger="manual" title="{__('Poll results', 'Link to edit this particular line')}" data-content="{__('Poll results', 'Link to edit this particular line has been copied!')}">
+                                <a href="{poll_url id=$poll->id vote_id=$vote->uniqId}" class="btn btn-default btn-sm clipboard-url" data-toggle="popover" data-trigger="manual" title="{__('Poll results', 'Link to edit this particular line')}" data-content="{__('Poll results', 'Link to edit this particular line has been copied inside the clipboard!')}">
                                     <i class="glyphicon glyphicon-link"></i><span class="sr-only">{__('Generic', 'Link')}</span>
                                 </a>
                                 <a href="{poll_url id=$admin_poll_id admin=true action='delete_vote' action_value=$vote->id}"