Chapril/date.chapril.org-framadate
Chapril/date.chapril.org-framadate
24
1
Fork 0
Code Issues Pull Requests Releases Activity

Merge branch 'improvement/find_poll_email_template' into 'develop'

Browse Source 
Improvement of the email template to find polls

Fix #78 

See merge request !111
This commit is contained in:
Olivier Perez 2016-05-03 14:21:19 +02:00
commit 6a277eeda3
8 changed files with 48 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
find_polls.php
View File

@ -43,7 +43,7 @@ if (!empty($_POST['mail'])) {
$smarty->assign('polls', $polls);
$body = $smarty->fetch('mail/find_polls.tpl');
$mailService->send($mail, __('Homepage', 'Where are my polls'), $body, 'SEND_POLLS');
$mailService->send($mail, __('FindPolls', 'List of your polls').' - '.NOMAPPLICATION, $body, 'SEND_POLLS');
$message = new Message('success', __('FindPolls', 'Polls sent'));
} else {
$message = new Message('warning', __('Error', 'No polls found'));

8
locale/de.json
View File

@ -312,9 +312,13 @@
"Purge the polls": "Umfragen vollständig löschen"
},
"FindPolls": {
"Here are your polls": "Hier sind Ihre Umfragen",
"Send me my polls": "Senden Sie mir mein Umfragen",
"Polls sent": "Umfragen abgeschickt"
"Polls sent": "Umfragen abgeschickt",
"List of your polls": "DE_Liste de vos sondages",
"Here is the list of the polls that you manage on %s:": "DE_Voici la liste des sondages que vous administrez sur %s :",
"Have a good day!": "DE_Bonne journée !",
"PS: this email has been sent because you – or someone else – asked to get back the polls created with your email address.": "DE_PS : ce mail a été envoyé parce que vous – ou quelqu'un d'autre – a demandé la récupération des sondages créés à l'aide de votre adresse email.",
"If you weren't the source of this action and if you think this is an abuse of the service, please notify the administrator on %s.": "DE_Si jamais vous n'étiez pas à l'origine de cette action et que vous pensez qu'il s'agit d'un abus, vous pouvez nous le signaler à l'administrateur sur %s."
},
"Mail": {
"Poll's participation: %s": "Beteiligung an der Umfrage: %s",

9
locale/en.json
View File

@ -312,9 +312,14 @@
"Purge the polls": "Purge the polls"
},
"FindPolls": {
"Here are your polls": "Here are your polls",
"Send me my polls": "Send me my polls",
"Polls sent": "Polls sent"
"Polls sent": "Polls sent",
"List of your polls": "List of your polls",
"Here is the list of the polls that you manage on %s:": "Here is the list of the polls that you manage on %s:",
"Have a good day!": "Have a good day!",
"PS: this email has been sent because you – or someone else – asked to get back the polls created with your email address.": "PS: this email has been sent because you – or someone else – asked to get back the polls created with your email address.",
"If you weren't the source of this action and if you think this is an abuse of the service, please notify the administrator on %s.": "If you weren't the source of this action and if you think this is an abuse of the service, please notify the administrator on %s."
},
"Mail" : {
"Poll's participation: %s": "Poll participation: %s",

8
locale/es.json
View File

@ -312,9 +312,13 @@
"Purge the polls": "Purgar las encuestas"
},
"FindPolls": {
"Here are your polls": "Esas son sus encuestas",
"Send me my polls": "Enviarme mis encuestas",
"Polls sent": "Encuestas enviadas"
"Polls sent": "Encuestas enviadas",
"List of your polls": "ES_Liste de vos sondages",
"Here is the list of the polls that you manage on %s:": "ES_Voici la liste des sondages que vous administrez sur %s :",
"Have a good day!": "ES_Bonne journée !",
"PS: this email has been sent because you – or someone else – asked to get back the polls created with your email address.": "ES_PS : ce mail a été envoyé parce que vous – ou quelqu'un d'autre – a demandé la récupération des sondages créés à l'aide de votre adresse email.",
"If you weren't the source of this action and if you think this is an abuse of the service, please notify the administrator on %s.": "ES_Si jamais vous n'étiez pas à l'origine de cette action et que vous pensez qu'il s'agit d'un abus, vous pouvez nous le signaler à l'administrateur sur %s."
},
"Mail": {
"Poll's participation: %s": "Participación a la encuesta: %s",

8
locale/fr.json
View File

@ -311,9 +311,13 @@
"Purge the polls": "Purger les sondages"
},
"FindPolls": {
"Here are your polls": "Voici tes sondages",
"Send me my polls": "Envoyer mes sondages",
"Polls sent": "Sondages envoyés"
"Polls sent": "Sondages envoyés",
"List of your polls": "Liste de vos sondages",
"Here is the list of the polls that you manage on %s:": "Voici la liste des sondages que vous administrez sur %s :",
"Have a good day!": "Bonne journée !",
"PS: this email has been sent because you – or someone else – asked to get back the polls created with your email address.": "PS : ce mail a été envoyé parce que vous – ou quelqu'un d'autre – a demandé la récupération des sondages créés à l'aide de votre adresse email.",
"If you weren't the source of this action and if you think this is an abuse of the service, please notify the administrator on %s.": "Si jamais vous n'étiez pas à l'origine de cette action et que vous pensez qu'il s'agit d'un abus, vous pouvez nous le signaler à l'administrateur sur %s."
},
"Mail": {
"Poll's participation: %s": "Participation au sondage : %s",

8
locale/it.json
View File

@ -312,9 +312,13 @@
"Purge the polls": "Depurare i sondaggi"
},
"FindPolls": {
"Here are your polls": "Ecco i tuoi sondaggi",
"Send me my polls": "Inviare i miei sondaggi",
"Polls sent": "Sondaggi inviati"
"Polls sent": "Sondaggi inviati",
"List of your polls": "IT_Liste de vos sondages",
"Here is the list of the polls that you manage on %s:": "IT_Voici la liste des sondages que vous administrez sur %s :",
"Have a good day!": "IT_Bonne journée !",
"PS: this email has been sent because you – or someone else – asked to get back the polls created with your email address.": "IT_PS : ce mail a été envoyé parce que vous – ou quelqu'un d'autre – a demandé la récupération des sondages créés à l'aide de votre adresse email.",
"If you weren't the source of this action and if you think this is an abuse of the service, please notify the administrator on %s.": "IT_Si jamais vous n'étiez pas à l'origine de cette action et que vous pensez qu'il s'agit d'un abus, vous pouvez nous le signaler à l'administrateur sur %s."
},
"Mail": {
"Poll's participation: %s": "Partecipazione al sondaggio: %s",

8
locale/oc.json
View File

@ -296,9 +296,13 @@
"Purge the polls": "Purgar los sondatges"
},
"FindPolls": {
"Here are your polls": "Vaquí vòstres sondatges",
"Send me my polls": "Mandar mos sondatges",
"Polls sent": "Sondatges mandats"
"Polls sent": "Sondatges mandats",
"List of your polls": "OC_Liste de vos sondages",
"Here is the list of the polls that you manage on %s:": "OC_Voici la liste des sondages que vous administrez sur %s :",
"Have a good day!": "OC_Bonne journée !",
"PS: this email has been sent because you – or someone else – asked to get back the polls created with your email address.": "OC_PS : ce mail a été envoyé parce que vous – ou quelqu'un d'autre – a demandé la récupération des sondages créés à l'aide de votre adresse email.",
"If you weren't the source of this action and if you think this is an abuse of the service, please notify the administrator on %s.": "OC_Si jamais vous n'étiez pas à l'origine de cette action et que vous pensez qu'il s'agit d'un abus, vous pouvez nous le signaler à l'administrateur sur %s."
},
"Mail": {
"Poll's participation: %s": "Participacion al sondatge : %s",

10
tpl/mail/find_polls.tpl
View File

@ -1,4 +1,4 @@
<h1>{__('FindPolls', 'Here are your polls')}</h1>
<p>{__f('FindPolls', 'Here is the list of the polls that you manage on %s:', $smarty.const.NOMAPPLICATION)}</p>
<ul>
{foreach $polls as $poll}
<li>
@ -7,3 +7,11 @@
</li>
{/foreach}
</ul>
<p>{__('FindPolls','Have a good day!')}</p>
<p>
<i>
{__('FindPolls','PS: this email has been sent because you – or someone else – asked to get back the polls created with your email address.')}
{capture name="email_url"}<a href="mailto:{$smarty.const.ADRESSEMAILADMIN}">{$smarty.const.ADRESSEMAILADMIN}</a>{/capture}
{__f('FindPolls',"If you weren't the source of this action and if you think this is an abuse of the service, please notify the administrator on %s.", $smarty.capture.email_url)}
</i>
</p>