This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git commit 2cdc8ec559ab509aca4cb585f05d635001447734 Author: Kevin Morin <morin@codelutin.com> Date: Tue Jun 6 10:58:38 2017 +0200 Suppression des balises html dans les emails --- pollen-services/src/main/resources/email/LostPasswordEmail.mustache | 2 +- .../src/main/resources/email/LostPasswordEmail_fr.mustache | 2 +- ...EndedEmail_en.mustache => PollChoicePeriodEndedEmail_fr.mustache} | 0 pollen-services/src/main/resources/email/PollCreatedEmail.mustache | 4 ++-- .../src/main/resources/email/PollCreatedEmail_fr.mustache | 4 ++-- .../src/main/resources/email/PollEndReminderEmail.mustache | 4 +++- .../src/main/resources/email/PollEndReminderEmail_fr.mustache | 4 +++- .../src/main/resources/email/PollInvitationEmail.mustache | 2 +- .../src/main/resources/email/PollInvitationEmail_fr.mustache | 2 +- .../src/main/resources/email/ResendValidationEmail.mustache | 5 ++--- .../src/main/resources/email/ResendValidationEmail_fr.mustache | 4 ++-- .../src/main/resources/email/RestrictedPollInvitationEmail.mustache | 2 +- .../main/resources/email/RestrictedPollInvitationEmail_fr.mustache | 2 +- .../src/main/resources/email/UserAccountCreatedEmail.mustache | 4 ++-- .../src/main/resources/email/UserAccountCreatedEmail_fr.mustache | 4 ++-- 15 files changed, 24 insertions(+), 21 deletions(-) diff --git a/pollen-services/src/main/resources/email/LostPasswordEmail.mustache b/pollen-services/src/main/resources/email/LostPasswordEmail.mustache index b6413168..2e0a823d 100644 --- a/pollen-services/src/main/resources/email/LostPasswordEmail.mustache +++ b/pollen-services/src/main/resources/email/LostPasswordEmail.mustache @@ -5,4 +5,4 @@ You have just asked for a new password generation for your Pollen account. Email: {{user.email}} Password: {{password}} -You can now manage your polls by logging on the <a href="{{url}}">Pollen</a> website. \ No newline at end of file +You can now manage your polls by logging on Pollen : {{url}} \ No newline at end of file diff --git a/pollen-services/src/main/resources/email/LostPasswordEmail_fr.mustache b/pollen-services/src/main/resources/email/LostPasswordEmail_fr.mustache index 8be64c4c..22866197 100644 --- a/pollen-services/src/main/resources/email/LostPasswordEmail_fr.mustache +++ b/pollen-services/src/main/resources/email/LostPasswordEmail_fr.mustache @@ -5,4 +5,4 @@ Vous venez de demander la génération d'un nouveau mot de passe d'accès à vot Courriel: {{user.email}} Mot de passe: {{password}} -Vous pouvez gérer vos sondages en vous connectant sur <a href="{{url}}">Pollen</a>. \ No newline at end of file +Vous pouvez gérer vos sondages en vous connectant sur Pollen : {{url}} \ No newline at end of file diff --git a/pollen-services/src/main/resources/email/PollChoicePeriodEndedEmail_en.mustache b/pollen-services/src/main/resources/email/PollChoicePeriodEndedEmail_fr.mustache similarity index 100% rename from pollen-services/src/main/resources/email/PollChoicePeriodEndedEmail_en.mustache rename to pollen-services/src/main/resources/email/PollChoicePeriodEndedEmail_fr.mustache diff --git a/pollen-services/src/main/resources/email/PollCreatedEmail.mustache b/pollen-services/src/main/resources/email/PollCreatedEmail.mustache index 8ebd3faf..54ac50ac 100644 --- a/pollen-services/src/main/resources/email/PollCreatedEmail.mustache +++ b/pollen-services/src/main/resources/email/PollCreatedEmail.mustache @@ -1,6 +1,6 @@ Hello {{poll.creator.name}}, -You had just created the new poll: <a href="{{url}}">{{poll.title}}</a> +You have just created the poll "{{poll.title}}". {{#poll.description}} @@ -12,4 +12,4 @@ You had just created the new poll: <a href="{{url}}">{{poll.title}}</a> {{/poll.description}} -You can now manage your polls by logging on the <a href="{{pollenUrl}}">Pollen</a> website. +You can administrate this poll here: {{url}} diff --git a/pollen-services/src/main/resources/email/PollCreatedEmail_fr.mustache b/pollen-services/src/main/resources/email/PollCreatedEmail_fr.mustache index 12e9bf76..7966f869 100644 --- a/pollen-services/src/main/resources/email/PollCreatedEmail_fr.mustache +++ b/pollen-services/src/main/resources/email/PollCreatedEmail_fr.mustache @@ -1,6 +1,6 @@ Bonjour {{poll.creator.name}}, -Le sondage vient d'être créé : <a href="{{url}}">{{poll.title}}</a> +Vous venez de créer le sondage "{{poll.title}}". {{#poll.description}} @@ -12,4 +12,4 @@ Le sondage vient d'être créé : <a href="{{url}}">{{poll.title}}</a> {{/poll.description}} -Vous pouvez gérer votre sondage en vous connectant sur <a href="{{pollenUrl}}">Pollen</a>. +Vous pouvez administrer ce sondage ici : {{url}} \ No newline at end of file diff --git a/pollen-services/src/main/resources/email/PollEndReminderEmail.mustache b/pollen-services/src/main/resources/email/PollEndReminderEmail.mustache index 7f00f3f1..6401ffcf 100644 --- a/pollen-services/src/main/resources/email/PollEndReminderEmail.mustache +++ b/pollen-services/src/main/resources/email/PollEndReminderEmail.mustache @@ -1,3 +1,5 @@ Hello {{poll.creator.name}}, -Your poll '{{poll.title}}' ends in less than {{poll.notifyMeHoursBeforePollEnds}} hours. \ No newline at end of file +Your poll "{{poll.title}}" ends in less than {{poll.notifyMeHoursBeforePollEnds}} hours. + +You can administrate this poll here: {{url}} \ No newline at end of file diff --git a/pollen-services/src/main/resources/email/PollEndReminderEmail_fr.mustache b/pollen-services/src/main/resources/email/PollEndReminderEmail_fr.mustache index 162c0cbc..3382e879 100644 --- a/pollen-services/src/main/resources/email/PollEndReminderEmail_fr.mustache +++ b/pollen-services/src/main/resources/email/PollEndReminderEmail_fr.mustache @@ -1,3 +1,5 @@ Bonjour {{poll.creator.name}}, -Votre sondage '{{poll.title}}' termine dans moins de {{poll.notifyMeHoursBeforePollEnds}} heures. \ No newline at end of file +Votre sondage "{{poll.title}}" sera terminé dans moins de {{poll.notifyMeHoursBeforePollEnds}} heures. + +Vous pouvez administrer ce sondage ici : {{url}} \ No newline at end of file diff --git a/pollen-services/src/main/resources/email/PollInvitationEmail.mustache b/pollen-services/src/main/resources/email/PollInvitationEmail.mustache index 39c54378..29e09482 100644 --- a/pollen-services/src/main/resources/email/PollInvitationEmail.mustache +++ b/pollen-services/src/main/resources/email/PollInvitationEmail.mustache @@ -18,4 +18,4 @@ Welcome, {{#beginDate}}Poll is open {{#endDate}}from {{beginDate}} to {{endDate}}{{/endDate}}{{^endDate}}from {{beginDate}}{{/endDate}}.{{/beginDate}} {{^beginDate}}{{#endDate}}Poll is open to {{endDate}}{{/endDate}}{{/beginDate}} -You must participate on this url <a href="{{voteUrl}}">{{voteUrl}}</a> +You must participate on this url: {{voteUrl}} diff --git a/pollen-services/src/main/resources/email/PollInvitationEmail_fr.mustache b/pollen-services/src/main/resources/email/PollInvitationEmail_fr.mustache index 4eee9d41..94f4ea61 100644 --- a/pollen-services/src/main/resources/email/PollInvitationEmail_fr.mustache +++ b/pollen-services/src/main/resources/email/PollInvitationEmail_fr.mustache @@ -17,4 +17,4 @@ Bonjour, {{#beginDate}}Les votes sont ouverts {{#endDate}}du {{beginDate}} au {{endDate}}{{/endDate}}{{^endDate}}à partir du {{beginDate}}{{/endDate}}.{{/beginDate}} {{^beginDate}}{{#endDate}}Les votes sont ouverts jusqu'au {{endDate}}{{/endDate}}{{/beginDate}} -Vous pouvez y participer avec l'adresse <a href="{{voteUrl}}">{{voteUrl}}</a> +Vous pouvez y participer avec l'adresse suivante : {{voteUrl}} diff --git a/pollen-services/src/main/resources/email/ResendValidationEmail.mustache b/pollen-services/src/main/resources/email/ResendValidationEmail.mustache index 5571f396..dee428bb 100644 --- a/pollen-services/src/main/resources/email/ResendValidationEmail.mustache +++ b/pollen-services/src/main/resources/email/ResendValidationEmail.mustache @@ -1,8 +1,7 @@ Welcome {{user.name}}, - You had just created an account on the web application Pollen. -You must validate your email on this url: <a href="{{validateUrl}}">{{validateUrl}}</a> +You must validate your email on this url: {{validateUrl}} -You can now manage your polls by logging on the <a href="{{pollenUrl}}">Pollen</a> website. \ No newline at end of file +You can now manage your polls by logging on Pollen: {{pollenUrl}} \ No newline at end of file diff --git a/pollen-services/src/main/resources/email/ResendValidationEmail_fr.mustache b/pollen-services/src/main/resources/email/ResendValidationEmail_fr.mustache index 5d4719c7..a4cec949 100644 --- a/pollen-services/src/main/resources/email/ResendValidationEmail_fr.mustache +++ b/pollen-services/src/main/resources/email/ResendValidationEmail_fr.mustache @@ -2,6 +2,6 @@ Bonjour {{user.name}}, Vous venez de créer un compte sur l'application en ligne Pollen -Vous devez valider votre courriel en allant sur cette adresse : <a href="{{validateUrl}}">{{validateUrl}}</a> +Vous devez valider votre courriel en allant sur cette adresse : {{validateUrl}} -Vous pouvez gérer vos sondages en vous connectant sur <a href="{{pollenUrl}}">Pollen</a>. \ No newline at end of file +Vous pouvez gérer vos sondages en vous connectant sur Pollen : {{pollenUrl}} \ No newline at end of file diff --git a/pollen-services/src/main/resources/email/RestrictedPollInvitationEmail.mustache b/pollen-services/src/main/resources/email/RestrictedPollInvitationEmail.mustache index 287e41ef..e23adb82 100644 --- a/pollen-services/src/main/resources/email/RestrictedPollInvitationEmail.mustache +++ b/pollen-services/src/main/resources/email/RestrictedPollInvitationEmail.mustache @@ -18,4 +18,4 @@ Welcom {{principal.name}}, {{#beginDate}}Poll is open {{#endDate}}from {{beginDate}} to {{endDate}}{{/endDate}}{{^endDate}}from {{beginDate}}{{/endDate}}.{{/beginDate}} {{^beginDate}}{{#endDate}}Poll is open to {{endDate}}{{/endDate}}{{/beginDate}} -You must participate on this url <a href="{{voteUrl}}">{{voteUrl}}</a> +You must participate on the following url : {{voteUrl}} \ No newline at end of file diff --git a/pollen-services/src/main/resources/email/RestrictedPollInvitationEmail_fr.mustache b/pollen-services/src/main/resources/email/RestrictedPollInvitationEmail_fr.mustache index df18a426..4d04e0c6 100644 --- a/pollen-services/src/main/resources/email/RestrictedPollInvitationEmail_fr.mustache +++ b/pollen-services/src/main/resources/email/RestrictedPollInvitationEmail_fr.mustache @@ -19,4 +19,4 @@ Bonjour {{principal.name}}, {{#beginDate}}Les votes sont ouverts {{#endDate}}du {{beginDate}} au {{endDate}}{{/endDate}}{{^endDate}}à partir du {{beginDate}}{{/endDate}}.{{/beginDate}} {{^beginDate}}{{#endDate}}Les votes sont ouverts jusqu'au {{endDate}}{{/endDate}}{{/beginDate}} -Vous pouvez y participer avec l'adresse <a href="{{voteUrl}}">{{voteUrl}}</a> +Vous pouvez y participer avec l'adresse suivante : {{voteUrl}} diff --git a/pollen-services/src/main/resources/email/UserAccountCreatedEmail.mustache b/pollen-services/src/main/resources/email/UserAccountCreatedEmail.mustache index 58da5716..87091260 100644 --- a/pollen-services/src/main/resources/email/UserAccountCreatedEmail.mustache +++ b/pollen-services/src/main/resources/email/UserAccountCreatedEmail.mustache @@ -4,6 +4,6 @@ You had just created an account on the web application Pollen. Email: {{user.email}} -You must validate your email on this url: <a href="{{validateUrl}}">{{validateUrl}}</a> +You must validate your email on this url: {{validateUrl}} -You can now manage your polls by logging on the <a href="{{pollenUrl}}">Pollen</a> website. \ No newline at end of file +You can now manage your polls by logging on Pollen: {{pollenUrl}} \ No newline at end of file diff --git a/pollen-services/src/main/resources/email/UserAccountCreatedEmail_fr.mustache b/pollen-services/src/main/resources/email/UserAccountCreatedEmail_fr.mustache index 85250fb5..78984533 100644 --- a/pollen-services/src/main/resources/email/UserAccountCreatedEmail_fr.mustache +++ b/pollen-services/src/main/resources/email/UserAccountCreatedEmail_fr.mustache @@ -4,6 +4,6 @@ Vous venez de créer un compte sur l'application en ligne Pollen Courriel: {{user.email}} -Vous devez valider votre courriel en allant sur cette adresse : <a href="{{validateUrl}}">{{validateUrl}}</a> +Vous devez valider votre courriel en allant sur cette adresse : {{validateUrl}} -Vous pouvez gérer vos sondages en vous connectant sur <a href="{{pollenUrl}}">Pollen</a>. \ No newline at end of file +Vous pouvez gérer vos sondages en vous connectant sur Pollen : {{pollenUrl}} \ No newline at end of file -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.