[pollen] branch develop updated (39d2b51 -> 05c1948)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository pollen. See http://git.chorem.org/pollen.git from 39d2b51 fixes #1064 print message when time of endDate is over new 05c1948 fix directory Mustache template The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 05c194811f52c567de9d43709a9ff6358f98de38 Author: Adrien Garandel <a.garandel@dralagen.fr> Date: Mon Aug 25 16:16:28 2014 +0200 fix directory Mustache template Summary of changes: .../main/java/org/chorem/pollen/services/service/mail/EmailService.java | 2 +- .../src/main/resources/email/PollCreatedEmail.mustache | 0 .../src/main/resources/email/PollCreatedEmail_fr.mustache | 0 3 files changed, 1 insertion(+), 1 deletion(-) copy pollen-rest-api/changelog.txt => pollen-services/src/main/resources/email/PollCreatedEmail.mustache (100%) copy pollen-rest-api/changelog.txt => pollen-services/src/main/resources/email/PollCreatedEmail_fr.mustache (100%) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository pollen. See http://git.chorem.org/pollen.git commit 05c194811f52c567de9d43709a9ff6358f98de38 Author: Adrien Garandel <a.garandel@dralagen.fr> Date: Mon Aug 25 16:16:28 2014 +0200 fix directory Mustache template --- .../main/java/org/chorem/pollen/services/service/mail/EmailService.java | 2 +- pollen-services/src/main/resources/email/PollCreatedEmail.mustache | 0 pollen-services/src/main/resources/email/PollCreatedEmail_fr.mustache | 0 3 files changed, 1 insertion(+), 1 deletion(-) 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 d2b9d46..b5ff353 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 @@ -265,7 +265,7 @@ public class EmailService extends PollenServiceSupport { protected Mustache getMustache(PollenMail mail) { - MustacheFactory mustacheFactory = new DefaultMustacheFactory("mail/"); + MustacheFactory mustacheFactory = new DefaultMustacheFactory("email/"); Locale locale = mail.getLocale(); String templateName = mail.getClass().getSimpleName() + "_" + locale.getLanguage() + ".mustache"; diff --git a/pollen-services/src/main/resources/email/PollCreatedEmail.mustache b/pollen-services/src/main/resources/email/PollCreatedEmail.mustache new file mode 100644 index 0000000..e69de29 diff --git a/pollen-services/src/main/resources/email/PollCreatedEmail_fr.mustache b/pollen-services/src/main/resources/email/PollCreatedEmail_fr.mustache new file mode 100644 index 0000000..e69de29 -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
participants (1)
-
chorem.org scm