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 7247a902d3515075b5648b5bfefce4380fe85309 Author: Kevin Morin <morin@codelutin.com> Date: Tue Jun 6 10:58:14 2017 +0200 ajout d'une signature commune à tous les mails --- .../chorem/pollen/services/service/mail/EmailService.java | 15 +++++++++++++-- .../chorem/pollen/services/service/mail/PollenMail.java | 9 +++++++++ pollen-services/src/main/resources/email/signing.mustache | 6 ++++++ .../src/main/resources/email/signing_fr.mustache | 6 ++++++ 4 files changed, 34 insertions(+), 2 deletions(-) diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/service/mail/EmailService.java b/pollen-services/src/main/java/org/chorem/pollen/services/service/mail/EmailService.java index d47eff68..be182080 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/service/mail/EmailService.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/service/mail/EmailService.java @@ -299,7 +299,7 @@ public class EmailService extends PollenServiceSupport { mustache.execute(stringWriter, mail); - return stringWriter.toString(); + return stringWriter.toString() + mail.getSigning(); } @@ -308,21 +308,32 @@ public class EmailService extends PollenServiceSupport { MustacheFactory mustacheFactory = new DefaultMustacheFactory("email/"); Locale locale = mail.getLocale(); + String signingTemplateName = "signing_" + locale.getLanguage() + ".mustache"; String templateName = mail.getClass().getSimpleName() + "_" + locale.getLanguage() + ".mustache"; Mustache mustache; try { + mail.setSigning(getSigning(mustacheFactory, signingTemplateName, mail)); mustache = mustacheFactory.compile(templateName); + } catch (MustacheException e) { // fallback with no locale - templateName = mail.getClass().getSimpleName() + ".mustache"; + signingTemplateName = "signing.mustache"; + mail.setSigning(getSigning(mustacheFactory, signingTemplateName, mail)); + templateName = mail.getClass().getSimpleName() + ".mustache"; mustache = mustacheFactory.compile(templateName); } return mustache; + } + protected String getSigning(MustacheFactory mustacheFactory, String signingTemplateName, PollenMail mail) { + StringWriter stringWriter = new StringWriter(); + Mustache mustache = mustacheFactory.compile(signingTemplateName); + mustache.execute(stringWriter, mail); + return stringWriter.toString(); } } diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/service/mail/PollenMail.java b/pollen-services/src/main/java/org/chorem/pollen/services/service/mail/PollenMail.java index 2a23f525..f1f59166 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/service/mail/PollenMail.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/service/mail/PollenMail.java @@ -44,6 +44,8 @@ public abstract class PollenMail { protected Set<String> bccs; + protected String signing; + public PollenMail(Locale locale) { this.locale = locale; } @@ -95,4 +97,11 @@ public abstract class PollenMail { return result; } + public String getSigning() { + return signing; + } + + public void setSigning(String signing) { + this.signing = signing; + } } diff --git a/pollen-services/src/main/resources/email/signing.mustache b/pollen-services/src/main/resources/email/signing.mustache new file mode 100644 index 00000000..24acddb6 --- /dev/null +++ b/pollen-services/src/main/resources/email/signing.mustache @@ -0,0 +1,6 @@ + + +-- + +Pollen, online poll webapp +{{pollenUrl}} \ No newline at end of file diff --git a/pollen-services/src/main/resources/email/signing_fr.mustache b/pollen-services/src/main/resources/email/signing_fr.mustache new file mode 100644 index 00000000..38352e8c --- /dev/null +++ b/pollen-services/src/main/resources/email/signing_fr.mustache @@ -0,0 +1,6 @@ + + +-- + +Pollen, application de sondages en ligne +{{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>.