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 be707f0bb226784441c8df269568235ee6540b8a Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Wed Oct 18 16:29:37 2017 +0200 Merge tag '3.0.2' into develop Pollen 3.0.2 # Conflicts: # pollen-persistence/pom.xml # pollen-rest-api/pom.xml # pollen-services/pom.xml # pollen-services/src/main/config/PollenServices.ini # pollen-services/src/main/java/org/chorem/pollen/services/PollenUIContext.java # pollen-services/src/main/java/org/chorem/pollen/services/config/PollenServicesConfig.java # pollen-services/src/main/java/org/chorem/pollen/services/service/mail/EmailService.java # pollen-ui-riot-js/package.json # pollen-ui-riot-js/pom.xml # pollen-ui-riot-js/src/main/web/i18n/en.json # pollen-ui-riot-js/src/main/web/i18n/fr.json # pollen-ui-riot-js/src/main/web/tag/favoriteList/FavoriteList.tag.html # pollen-votecounting-aggregator/pom.xml # pollen-votecounting-api/pom.xml # pollen-votecounting-borda/pom.xml # pollen-votecounting-condorcet/pom.xml # pollen-votecounting-coombs/pom.xml # pollen-votecounting-cumulative/pom.xml # pollen-votecounting-instant-runoff/pom.xml # pollen-votecounting-normal/pom.xml # pollen-votecounting-number/pom.xml # pom.xml --- .../java/org/chorem/pollen/services/service/mail/EmailService.java | 4 ++-- .../chorem/pollen/services/service/mail/ExceedingMaxVotersEmail.java | 5 +++-- .../services/service/mail/UserAccountEmailAddressAddedEmail.java | 5 +++-- 3 files changed, 8 insertions(+), 6 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 acf952c5..389ea4a7 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 @@ -267,7 +267,7 @@ public class EmailService extends PollenServiceSupport { public UserAccountEmailAddressAddedEmail newUserAccountEmailAddressAddedEmail(PollenUser user, PollenUserEmailAddress emailAddress) { - UserAccountEmailAddressAddedEmail email = new UserAccountEmailAddressAddedEmail(getLocale()); + UserAccountEmailAddressAddedEmail email = new UserAccountEmailAddressAddedEmail(getLocale(), getTimeZone()); email.setUser(user); PollenEntityId<PollenUser> userId = getPollenEntityId(user); email.setValidateUrl(getPollenUIUrlRenderService().getUserValidateUrl(getUIContext().getUserValidateUrl(), @@ -630,7 +630,7 @@ public class EmailService extends PollenServiceSupport { } public ExceedingMaxVotersEmail newExceedingMaxVotersEmail(Poll poll, int maxVoters) { - ExceedingMaxVotersEmail email = new ExceedingMaxVotersEmail(getLocale()); + ExceedingMaxVotersEmail email = new ExceedingMaxVotersEmail(getLocale(), getTimeZone()); email.setPoll(poll); email.setMaxVoters(maxVoters); email.setOffersUrl(getUIContext().getOffersUrl()); diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/service/mail/ExceedingMaxVotersEmail.java b/pollen-services/src/main/java/org/chorem/pollen/services/service/mail/ExceedingMaxVotersEmail.java index eb862893..54aa49a8 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/service/mail/ExceedingMaxVotersEmail.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/service/mail/ExceedingMaxVotersEmail.java @@ -25,6 +25,7 @@ import org.chorem.pollen.persistence.entity.Poll; import org.nuiton.i18n.I18n; import java.util.Locale; +import java.util.TimeZone; /** * Created on 4/30/14. @@ -38,8 +39,8 @@ public class ExceedingMaxVotersEmail extends PollenMail { private int maxVoters; private String offersUrl; - protected ExceedingMaxVotersEmail(Locale locale) { - super(locale); + protected ExceedingMaxVotersEmail(Locale locale, TimeZone timeZone) { + super(locale, timeZone); } @Override diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/service/mail/UserAccountEmailAddressAddedEmail.java b/pollen-services/src/main/java/org/chorem/pollen/services/service/mail/UserAccountEmailAddressAddedEmail.java index b61c28dc..69402fa7 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/service/mail/UserAccountEmailAddressAddedEmail.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/service/mail/UserAccountEmailAddressAddedEmail.java @@ -25,6 +25,7 @@ import org.chorem.pollen.persistence.entity.PollenUser; import org.nuiton.i18n.I18n; import java.util.Locale; +import java.util.TimeZone; /** * @author Kevin Morin - morin@codelutin.com @@ -35,8 +36,8 @@ public class UserAccountEmailAddressAddedEmail extends PollenMail { private String validateUrl; - protected UserAccountEmailAddressAddedEmail(Locale locale) { - super(locale); + protected UserAccountEmailAddressAddedEmail(Locale locale, TimeZone timeZone) { + super(locale, timeZone); } @Override -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.