branch hotfix/3.0.2 updated (b04aa221 -> bee58e82)
This is an automated email from the git hooks/post-receive script. New change to branch hotfix/3.0.2 in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git from b04aa221 modification de la version de pollen => 3.0.2 new bee58e82 A jout du fuseau horaire en configuration dans le formatage des dates pour les courriels 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 bee58e828b6308f1c44be0fb1b379ff8b910da95 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Wed Oct 18 12:04:33 2017 +0200 A jout du fuseau horaire en configuration dans le formatage des dates pour les courriels Summary of changes: pollen-services/src/main/config/PollenServices.ini | 8 ++- .../chorem/pollen/services/PollenUIContext.java | 10 +++ .../services/config/PollenServicesConfig.java | 5 ++ .../services/service/mail/AbstractReportEmail.java | 5 +- .../service/mail/AbstractReportForAdminEmail.java | 5 +- .../services/service/mail/AbstractVoteEmail.java | 5 +- .../services/service/mail/ChoiceAddedEmail.java | 5 +- .../services/service/mail/ChoiceDeletedEmail.java | 5 +- .../services/service/mail/ChoiceEditedEmail.java | 5 +- .../services/service/mail/ChoiceReportEmail.java | 5 +- .../service/mail/ChoiceReportForAdminEmail.java | 5 +- .../services/service/mail/CommentAddedEmail.java | 5 +- .../services/service/mail/CommentDeletedEmail.java | 5 +- .../services/service/mail/CommentEditedEmail.java | 5 +- .../services/service/mail/CommentReportEmail.java | 5 +- .../service/mail/CommentReportForAdminEmail.java | 5 +- .../pollen/services/service/mail/EmailService.java | 76 ++++++++++++---------- .../services/service/mail/FeedbackEmail.java | 5 +- .../services/service/mail/LostPasswordEmail.java | 5 +- .../service/mail/PollChoicePeriodEndedEmail.java | 5 +- .../service/mail/PollChoicePeriodStartedEmail.java | 5 +- .../services/service/mail/PollClosedEmail.java | 5 +- .../services/service/mail/PollCreatedEmail.java | 5 +- .../service/mail/PollEndReminderEmail.java | 5 +- .../services/service/mail/PollInvitationEmail.java | 5 +- .../services/service/mail/PollReportEmail.java | 5 +- .../service/mail/PollReportForAdminEmail.java | 5 +- .../service/mail/PollVotePeriodEndedEmail.java | 5 +- .../service/mail/PollVotePeriodStartedEmail.java | 5 +- .../service/mail/PollVoteReminderEmail.java | 5 +- .../pollen/services/service/mail/PollenMail.java | 11 +++- .../service/mail/ResendValidationEmail.java | 5 +- .../mail/RestrictedPollInvitationEmail.java | 5 +- .../service/mail/UserAccountCreatedEmail.java | 5 +- .../mail/UserAccountCreatedFromProviderEmail.java | 5 +- .../service/mail/UserAccountDeletedEmail.java | 5 +- .../service/mail/UserAccountEditedEmail.java | 5 +- .../mail/UserAccountEmailValidatedEmail.java | 5 +- .../mail/UserAccountPasswordChangedEmail.java | 5 +- .../services/service/mail/VoteAddedEmail.java | 5 +- .../services/service/mail/VoteDeletedEmail.java | 5 +- .../services/service/mail/VoteEditedEmail.java | 5 +- .../i18n/pollen-services_en_GB.properties | 1 + .../i18n/pollen-services_fr_FR.properties | 1 + 44 files changed, 184 insertions(+), 113 deletions(-) -- 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 hotfix/3.0.2 in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git commit bee58e828b6308f1c44be0fb1b379ff8b910da95 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Wed Oct 18 12:04:33 2017 +0200 A jout du fuseau horaire en configuration dans le formatage des dates pour les courriels --- pollen-services/src/main/config/PollenServices.ini | 8 ++- .../chorem/pollen/services/PollenUIContext.java | 10 +++ .../services/config/PollenServicesConfig.java | 5 ++ .../services/service/mail/AbstractReportEmail.java | 5 +- .../service/mail/AbstractReportForAdminEmail.java | 5 +- .../services/service/mail/AbstractVoteEmail.java | 5 +- .../services/service/mail/ChoiceAddedEmail.java | 5 +- .../services/service/mail/ChoiceDeletedEmail.java | 5 +- .../services/service/mail/ChoiceEditedEmail.java | 5 +- .../services/service/mail/ChoiceReportEmail.java | 5 +- .../service/mail/ChoiceReportForAdminEmail.java | 5 +- .../services/service/mail/CommentAddedEmail.java | 5 +- .../services/service/mail/CommentDeletedEmail.java | 5 +- .../services/service/mail/CommentEditedEmail.java | 5 +- .../services/service/mail/CommentReportEmail.java | 5 +- .../service/mail/CommentReportForAdminEmail.java | 5 +- .../pollen/services/service/mail/EmailService.java | 76 ++++++++++++---------- .../services/service/mail/FeedbackEmail.java | 5 +- .../services/service/mail/LostPasswordEmail.java | 5 +- .../service/mail/PollChoicePeriodEndedEmail.java | 5 +- .../service/mail/PollChoicePeriodStartedEmail.java | 5 +- .../services/service/mail/PollClosedEmail.java | 5 +- .../services/service/mail/PollCreatedEmail.java | 5 +- .../service/mail/PollEndReminderEmail.java | 5 +- .../services/service/mail/PollInvitationEmail.java | 5 +- .../services/service/mail/PollReportEmail.java | 5 +- .../service/mail/PollReportForAdminEmail.java | 5 +- .../service/mail/PollVotePeriodEndedEmail.java | 5 +- .../service/mail/PollVotePeriodStartedEmail.java | 5 +- .../service/mail/PollVoteReminderEmail.java | 5 +- .../pollen/services/service/mail/PollenMail.java | 11 +++- .../service/mail/ResendValidationEmail.java | 5 +- .../mail/RestrictedPollInvitationEmail.java | 5 +- .../service/mail/UserAccountCreatedEmail.java | 5 +- .../mail/UserAccountCreatedFromProviderEmail.java | 5 +- .../service/mail/UserAccountDeletedEmail.java | 5 +- .../service/mail/UserAccountEditedEmail.java | 5 +- .../mail/UserAccountEmailValidatedEmail.java | 5 +- .../mail/UserAccountPasswordChangedEmail.java | 5 +- .../services/service/mail/VoteAddedEmail.java | 5 +- .../services/service/mail/VoteDeletedEmail.java | 5 +- .../services/service/mail/VoteEditedEmail.java | 5 +- .../i18n/pollen-services_en_GB.properties | 1 + .../i18n/pollen-services_fr_FR.properties | 1 + 44 files changed, 184 insertions(+), 113 deletions(-) diff --git a/pollen-services/src/main/config/PollenServices.ini b/pollen-services/src/main/config/PollenServices.ini index f6a42182..cad9df6f 100644 --- a/pollen-services/src/main/config/PollenServices.ini +++ b/pollen-services/src/main/config/PollenServices.ini @@ -205,4 +205,10 @@ type = String description = pollen.configuration.feedback.locale key = pollen.feedback.locale type = String -defaultValue = en \ No newline at end of file +defaultValue = en + +[option defaultTimeZoneId] +description = pollen.configuration.defaultTimeZoneId +key = pollen.default.timeZoneId +type = String +defaultValue = Europe/Paris \ No newline at end of file diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/PollenUIContext.java b/pollen-services/src/main/java/org/chorem/pollen/services/PollenUIContext.java index a707476e..947714cc 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/PollenUIContext.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/PollenUIContext.java @@ -44,6 +44,8 @@ public class PollenUIContext implements Serializable { private String profileUrl; + private String timeZone; + public String getUiEndPoint() { return uiEndPoint; } @@ -107,4 +109,12 @@ public class PollenUIContext implements Serializable { public void setProfileUrl(String profileUrl) { this.profileUrl = profileUrl; } + + public String getTimeZone() { + return timeZone; + } + + public void setTimeZone(String timeZone) { + this.timeZone = timeZone; + } } diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/config/PollenServicesConfig.java b/pollen-services/src/main/java/org/chorem/pollen/services/config/PollenServicesConfig.java index 37fc3d79..ba08d417 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/config/PollenServicesConfig.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/config/PollenServicesConfig.java @@ -40,6 +40,7 @@ import java.util.List; import java.util.Locale; import java.util.Map; import java.util.Properties; +import java.util.TimeZone; /** * TODO @@ -158,4 +159,8 @@ public class PollenServicesConfig extends GeneratedPollenServicesConfig { public Locale getFeedbackLocale() { return Locale.forLanguageTag(get().getOption(PollenServicesConfigOption.LOCALE_FEEDBACK.getKey())); } + + public TimeZone getDefaultTimeZone() { + return TimeZone.getTimeZone(get().getOption(PollenServicesConfigOption.DEFAULT_TIME_ZONE_ID.getKey())); + } } diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/service/mail/AbstractReportEmail.java b/pollen-services/src/main/java/org/chorem/pollen/services/service/mail/AbstractReportEmail.java index 23946a15..0cf00f57 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/service/mail/AbstractReportEmail.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/service/mail/AbstractReportEmail.java @@ -27,6 +27,7 @@ import org.chorem.pollen.services.bean.ReportLevel; import org.nuiton.topia.persistence.TopiaEntity; import java.util.Locale; +import java.util.TimeZone; /** * @author Sylvain Bavencoff - bavencoff@codelutin.com @@ -41,8 +42,8 @@ public abstract class AbstractReportEmail<T extends TopiaEntity> extends Pollen protected String url; - public AbstractReportEmail(Locale locale) { - super(locale); + public AbstractReportEmail(Locale locale, TimeZone timeZone) { + super(locale, timeZone); } public Poll getPoll() { diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/service/mail/AbstractReportForAdminEmail.java b/pollen-services/src/main/java/org/chorem/pollen/services/service/mail/AbstractReportForAdminEmail.java index 24339702..38e86ecd 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/service/mail/AbstractReportForAdminEmail.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/service/mail/AbstractReportForAdminEmail.java @@ -28,6 +28,7 @@ import org.nuiton.topia.persistence.TopiaEntity; import java.util.List; import java.util.Locale; +import java.util.TimeZone; /** * @author Sylvain Bavencoff - bavencoff@codelutin.com @@ -40,8 +41,8 @@ public abstract class AbstractReportForAdminEmail<T extends TopiaEntity> extends protected ReportResume resume; - public AbstractReportForAdminEmail(Locale locale) { - super(locale); + public AbstractReportForAdminEmail(Locale locale, TimeZone timeZone) { + super(locale, timeZone); } public PollenUser getAdministrator() { diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/service/mail/AbstractVoteEmail.java b/pollen-services/src/main/java/org/chorem/pollen/services/service/mail/AbstractVoteEmail.java index aa200a1c..e2096027 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/service/mail/AbstractVoteEmail.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/service/mail/AbstractVoteEmail.java @@ -25,6 +25,7 @@ import org.chorem.pollen.persistence.entity.Poll; import org.chorem.pollen.persistence.entity.Vote; import java.util.Locale; +import java.util.TimeZone; /** * @author Kevin Morin @@ -35,8 +36,8 @@ public abstract class AbstractVoteEmail extends PollenMail { protected final Vote vote; - protected AbstractVoteEmail(Locale locale, Poll poll, Vote vote) { - super(locale); + protected AbstractVoteEmail(Locale locale, TimeZone timeZone, Poll poll, Vote vote) { + super(locale, timeZone); this.poll = poll; this.vote = vote; } diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/service/mail/ChoiceAddedEmail.java b/pollen-services/src/main/java/org/chorem/pollen/services/service/mail/ChoiceAddedEmail.java index 329741f6..f034d634 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/service/mail/ChoiceAddedEmail.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/service/mail/ChoiceAddedEmail.java @@ -26,6 +26,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. @@ -39,8 +40,8 @@ public class ChoiceAddedEmail extends PollenMail { protected Choice choice; - protected ChoiceAddedEmail(Locale locale) { - super(locale); + protected ChoiceAddedEmail(Locale locale, TimeZone timeZone) { + super(locale, timeZone); } @Override diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/service/mail/ChoiceDeletedEmail.java b/pollen-services/src/main/java/org/chorem/pollen/services/service/mail/ChoiceDeletedEmail.java index ae8a5e30..4d50df0a 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/service/mail/ChoiceDeletedEmail.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/service/mail/ChoiceDeletedEmail.java @@ -26,6 +26,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. @@ -39,8 +40,8 @@ public class ChoiceDeletedEmail extends PollenMail { protected Choice choice; - protected ChoiceDeletedEmail(Locale locale) { - super(locale); + protected ChoiceDeletedEmail(Locale locale, TimeZone timeZone) { + super(locale, timeZone); } @Override diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/service/mail/ChoiceEditedEmail.java b/pollen-services/src/main/java/org/chorem/pollen/services/service/mail/ChoiceEditedEmail.java index 0114235a..5af161b6 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/service/mail/ChoiceEditedEmail.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/service/mail/ChoiceEditedEmail.java @@ -26,6 +26,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. @@ -39,8 +40,8 @@ public class ChoiceEditedEmail extends PollenMail { protected Choice choice; - protected ChoiceEditedEmail(Locale locale) { - super(locale); + protected ChoiceEditedEmail(Locale locale, TimeZone timeZone) { + super(locale, timeZone); } @Override diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/service/mail/ChoiceReportEmail.java b/pollen-services/src/main/java/org/chorem/pollen/services/service/mail/ChoiceReportEmail.java index 1fe63413..89d892aa 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/service/mail/ChoiceReportEmail.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/service/mail/ChoiceReportEmail.java @@ -25,6 +25,7 @@ import org.chorem.pollen.persistence.entity.Choice; import org.nuiton.i18n.I18n; import java.util.Locale; +import java.util.TimeZone; /** * @author Sylvain Bavencoff - bavencoff@codelutin.com @@ -33,8 +34,8 @@ public class ChoiceReportEmail extends AbstractReportEmail<Choice> { private String choiceValue; - public ChoiceReportEmail(Locale locale) { - super(locale); + public ChoiceReportEmail(Locale locale, TimeZone timeZone) { + super(locale, timeZone); } @Override diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/service/mail/ChoiceReportForAdminEmail.java b/pollen-services/src/main/java/org/chorem/pollen/services/service/mail/ChoiceReportForAdminEmail.java index 5b528dd5..bb75122f 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/service/mail/ChoiceReportForAdminEmail.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/service/mail/ChoiceReportForAdminEmail.java @@ -25,6 +25,7 @@ import org.chorem.pollen.persistence.entity.Choice; import org.nuiton.i18n.I18n; import java.util.Locale; +import java.util.TimeZone; /** * @author Sylvain Bavencoff - bavencoff@codelutin.com @@ -33,8 +34,8 @@ public class ChoiceReportForAdminEmail extends AbstractReportForAdminEmail<Choic private String choiceValue; - public ChoiceReportForAdminEmail(Locale locale) { - super(locale); + public ChoiceReportForAdminEmail(Locale locale, TimeZone timeZone) { + super(locale, timeZone); } @Override diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/service/mail/CommentAddedEmail.java b/pollen-services/src/main/java/org/chorem/pollen/services/service/mail/CommentAddedEmail.java index 96877ec1..3df9eadd 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/service/mail/CommentAddedEmail.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/service/mail/CommentAddedEmail.java @@ -26,6 +26,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. @@ -39,8 +40,8 @@ public class CommentAddedEmail extends PollenMail { protected Comment comment; - protected CommentAddedEmail(Locale locale) { - super(locale); + protected CommentAddedEmail(Locale locale, TimeZone timeZone) { + super(locale, timeZone); } @Override diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/service/mail/CommentDeletedEmail.java b/pollen-services/src/main/java/org/chorem/pollen/services/service/mail/CommentDeletedEmail.java index c93a6133..b7e745a8 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/service/mail/CommentDeletedEmail.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/service/mail/CommentDeletedEmail.java @@ -26,6 +26,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. @@ -39,8 +40,8 @@ public class CommentDeletedEmail extends PollenMail { protected Comment comment; - protected CommentDeletedEmail(Locale locale) { - super(locale); + protected CommentDeletedEmail(Locale locale, TimeZone timeZone) { + super(locale, timeZone); } @Override diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/service/mail/CommentEditedEmail.java b/pollen-services/src/main/java/org/chorem/pollen/services/service/mail/CommentEditedEmail.java index bcb081dc..e583ab8f 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/service/mail/CommentEditedEmail.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/service/mail/CommentEditedEmail.java @@ -26,6 +26,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. @@ -39,8 +40,8 @@ public class CommentEditedEmail extends PollenMail { protected Comment comment; - protected CommentEditedEmail(Locale locale) { - super(locale); + protected CommentEditedEmail(Locale locale, TimeZone timeZone) { + super(locale, timeZone); } @Override diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/service/mail/CommentReportEmail.java b/pollen-services/src/main/java/org/chorem/pollen/services/service/mail/CommentReportEmail.java index 31fe97a8..d1fafcce 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/service/mail/CommentReportEmail.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/service/mail/CommentReportEmail.java @@ -25,14 +25,15 @@ import org.chorem.pollen.persistence.entity.Comment; import org.nuiton.i18n.I18n; import java.util.Locale; +import java.util.TimeZone; /** * @author Sylvain Bavencoff - bavencoff@codelutin.com */ public class CommentReportEmail extends AbstractReportEmail<Comment> { - public CommentReportEmail(Locale locale) { - super(locale); + public CommentReportEmail(Locale locale, TimeZone timeZone) { + super(locale, timeZone); } @Override diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/service/mail/CommentReportForAdminEmail.java b/pollen-services/src/main/java/org/chorem/pollen/services/service/mail/CommentReportForAdminEmail.java index fc01de70..80e576d5 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/service/mail/CommentReportForAdminEmail.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/service/mail/CommentReportForAdminEmail.java @@ -25,14 +25,15 @@ import org.chorem.pollen.persistence.entity.Comment; import org.nuiton.i18n.I18n; import java.util.Locale; +import java.util.TimeZone; /** * @author Sylvain Bavencoff - bavencoff@codelutin.com */ public class CommentReportForAdminEmail extends AbstractReportForAdminEmail<Comment> { - public CommentReportForAdminEmail(Locale locale) { - super(locale); + public CommentReportForAdminEmail(Locale locale, TimeZone timeZone) { + super(locale, timeZone); } @Override 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 eed9fe95..aae2777f 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 @@ -63,6 +63,7 @@ import java.util.List; import java.util.Locale; import java.util.Map; import java.util.Set; +import java.util.TimeZone; import static org.nuiton.i18n.I18n.n; import static org.nuiton.i18n.I18n.t; @@ -102,62 +103,67 @@ public class EmailService extends PollenServiceSupport { n("pollen.service.mail.loginProvider.yammer"); } + protected TimeZone getTimeZone() { + TimeZone timeZone = getPollenServiceConfig().getDefaultTimeZone(); + return timeZone; + } + public ChoiceAddedEmail newChoiceAddedEmail(Poll poll, Choice choice) { - ChoiceAddedEmail email = new ChoiceAddedEmail(getLocale()); + ChoiceAddedEmail email = new ChoiceAddedEmail(getLocale(), getTimeZone()); email.setPoll(poll); email.setChoice(choice); return email; } public ChoiceEditedEmail newChoiceEditedEmail(Poll poll, Choice choice) { - ChoiceEditedEmail email = new ChoiceEditedEmail(getLocale()); + ChoiceEditedEmail email = new ChoiceEditedEmail(getLocale(), getTimeZone()); email.setPoll(poll); email.setChoice(choice); return email; } public ChoiceDeletedEmail newChoiceDeletedEmail(Poll poll, Choice choice) { - ChoiceDeletedEmail email = new ChoiceDeletedEmail(getLocale()); + ChoiceDeletedEmail email = new ChoiceDeletedEmail(getLocale(), getTimeZone()); email.setPoll(poll); email.setChoice(choice); return email; } public CommentAddedEmail newCommentAddedEmail(Poll poll, Comment comment) { - CommentAddedEmail email = new CommentAddedEmail(getLocale()); + CommentAddedEmail email = new CommentAddedEmail(getLocale(), getTimeZone()); email.setPoll(poll); email.setComment(comment); return email; } public CommentEditedEmail newCommentEditedEmail(Poll poll, Comment comment) { - CommentEditedEmail email = new CommentEditedEmail(getLocale()); + CommentEditedEmail email = new CommentEditedEmail(getLocale(), getTimeZone()); email.setPoll(poll); email.setComment(comment); return email; } public CommentDeletedEmail newCommentDeletedEmail(Poll poll, Comment comment) { - CommentDeletedEmail email = new CommentDeletedEmail(getLocale()); + CommentDeletedEmail email = new CommentDeletedEmail(getLocale(), getTimeZone()); email.setPoll(poll); email.setComment(comment); return email; } public VoteAddedEmail newVoteAddedEmail(Poll poll, Vote vote) { - return new VoteAddedEmail(getLocale(), poll, vote); + return new VoteAddedEmail(getLocale(), getTimeZone(), poll, vote); } public VoteEditedEmail newVoteEditedEmail(Poll poll, Vote vote) { - return new VoteEditedEmail(getLocale(), poll, vote); + return new VoteEditedEmail(getLocale(), getTimeZone(), poll, vote); } public VoteDeletedEmail newVoteDeletedEmail(Poll poll, Vote vote) { - return new VoteDeletedEmail(getLocale(), poll, vote); + return new VoteDeletedEmail(getLocale(), getTimeZone(), poll, vote); } public PollCreatedEmail newPollCreatedEmail(Poll poll) { - PollCreatedEmail email = new PollCreatedEmail(getLocale()); + PollCreatedEmail email = new PollCreatedEmail(getLocale(), getTimeZone()); email.setPoll(poll); email.setPollenUrl(getUIContext().getUiEndPoint()); @@ -171,43 +177,43 @@ public class EmailService extends PollenServiceSupport { } public PollClosedEmail newPollClosedEmail(Poll poll) { - PollClosedEmail email = new PollClosedEmail(getLocale()); + PollClosedEmail email = new PollClosedEmail(getLocale(), getTimeZone()); email.setPoll(poll); return email; } public PollChoicePeriodStartedEmail newPollChoicePeriodStartedEmail(Poll poll) { - PollChoicePeriodStartedEmail email = new PollChoicePeriodStartedEmail(getLocale()); + PollChoicePeriodStartedEmail email = new PollChoicePeriodStartedEmail(getLocale(), getTimeZone()); email.setPoll(poll); return email; } public PollChoicePeriodEndedEmail newPollChoicePeriodEndedEmail(Poll poll) { - PollChoicePeriodEndedEmail email = new PollChoicePeriodEndedEmail(getLocale()); + PollChoicePeriodEndedEmail email = new PollChoicePeriodEndedEmail(getLocale(), getTimeZone()); email.setPoll(poll); return email; } public PollVotePeriodStartedEmail newPollVotePeriodStartedEmail(Poll poll) { - PollVotePeriodStartedEmail email = new PollVotePeriodStartedEmail(getLocale()); + PollVotePeriodStartedEmail email = new PollVotePeriodStartedEmail(getLocale(), getTimeZone()); email.setPoll(poll); return email; } public PollVotePeriodEndedEmail newPollVotePeriodEndedEmail(Poll poll) { - PollVotePeriodEndedEmail email = new PollVotePeriodEndedEmail(getLocale()); + PollVotePeriodEndedEmail email = new PollVotePeriodEndedEmail(getLocale(), getTimeZone()); email.setPoll(poll); return email; } public PollVoteReminderEmail newPollVoteReminderEmail(Poll poll) { - PollVoteReminderEmail email = new PollVoteReminderEmail(getLocale()); + PollVoteReminderEmail email = new PollVoteReminderEmail(getLocale(), getTimeZone()); email.setPoll(poll); return email; } public PollInvitationEmail newPollInvitationEmail(Poll poll) { - PollInvitationEmail email = new PollInvitationEmail(getLocale()); + PollInvitationEmail email = new PollInvitationEmail(getLocale(), getTimeZone()); email.setPoll(poll); email.setVoteUrl(getPollVoteUrl(poll)); @@ -215,7 +221,7 @@ public class EmailService extends PollenServiceSupport { } public RestrictedPollInvitationEmail newRestrictedPollInvitationEmail(Poll poll, PollenPrincipal principal) { - RestrictedPollInvitationEmail email = new RestrictedPollInvitationEmail(getLocale()); + RestrictedPollInvitationEmail email = new RestrictedPollInvitationEmail(getLocale(), getTimeZone()); email.setPoll(poll); email.setPrincipal(principal); email.setVoteUrl(getPollVoteUrl(poll, principal.getPermission().getToken())); @@ -226,7 +232,7 @@ public class EmailService extends PollenServiceSupport { } public UserAccountCreatedEmail newUserAccountCreatedEmail(PollenUser user) { - UserAccountCreatedEmail email = new UserAccountCreatedEmail(getLocale()); + UserAccountCreatedEmail email = new UserAccountCreatedEmail(getLocale(), getTimeZone()); email.setUser(user); email.setPollenUrl(getUIContext().getUiEndPoint()); @@ -241,7 +247,7 @@ public class EmailService extends PollenServiceSupport { public UserAccountCreatedFromProviderEmail newUserAccountCreatedFromProviderEmail(PollenUser user, UserCredential credential) { - UserAccountCreatedFromProviderEmail email = new UserAccountCreatedFromProviderEmail(getLocale()); + UserAccountCreatedFromProviderEmail email = new UserAccountCreatedFromProviderEmail(getLocale(), getTimeZone()); email.setUser(user); email.setProvider(t("pollen.service.mail.loginProvider." + credential.getProvider())); email.setProfileUrl(getUIContext().getProfileUrl()); @@ -249,25 +255,25 @@ public class EmailService extends PollenServiceSupport { } public UserAccountEditedEmail newUserAccountEditedEmail(PollenUser user) { - UserAccountEditedEmail email = new UserAccountEditedEmail(getLocale()); + UserAccountEditedEmail email = new UserAccountEditedEmail(getLocale(), getTimeZone()); email.setUser(user); return email; } public UserAccountDeletedEmail newUserAccountDeletedEmail(PollenUser user) { - UserAccountDeletedEmail email = new UserAccountDeletedEmail(getLocale()); + UserAccountDeletedEmail email = new UserAccountDeletedEmail(getLocale(), getTimeZone()); email.setUser(user); return email; } public UserAccountEmailValidatedEmail newUserAccountEmailValidatedEmail(PollenUser user) { - UserAccountEmailValidatedEmail email = new UserAccountEmailValidatedEmail(getLocale()); + UserAccountEmailValidatedEmail email = new UserAccountEmailValidatedEmail(getLocale(), getTimeZone()); email.setUser(user); return email; } public ResendValidationEmail newUserResendValidationEmail(PollenUser user) { - ResendValidationEmail email = new ResendValidationEmail(getLocale()); + ResendValidationEmail email = new ResendValidationEmail(getLocale(), getTimeZone()); email.setUser(user); email.setPollenUrl(getUIContext().getUiEndPoint()); @@ -280,20 +286,20 @@ public class EmailService extends PollenServiceSupport { } public UserAccountPasswordChangedEmail newUserAccountPasswordChangedEmail(PollenUser user) { - UserAccountPasswordChangedEmail email = new UserAccountPasswordChangedEmail(getLocale()); + UserAccountPasswordChangedEmail email = new UserAccountPasswordChangedEmail(getLocale(), getTimeZone()); email.setUser(user); return email; } public LostPasswordEmail newLostPasswordEmail(PollenUser user, String password) { - LostPasswordEmail email = new LostPasswordEmail(getLocale()); + LostPasswordEmail email = new LostPasswordEmail(getLocale(), getTimeZone()); email.setUser(user); email.setPassword(password); return email; } public PollEndReminderEmail newPollEndReminderEmail(Poll poll) { - PollEndReminderEmail email = new PollEndReminderEmail(getLocale()); + PollEndReminderEmail email = new PollEndReminderEmail(getLocale(), getTimeZone()); email.setPoll(poll); return email; } @@ -455,7 +461,7 @@ public class EmailService extends PollenServiceSupport { public CommentReportEmail newCommentReportEmail(Poll poll, Comment comment, Report report) { // FIXME BAVENCOFF 15/06/2017 la local du mail devrait etre celle du destinataire - CommentReportEmail email = new CommentReportEmail(getLocale()); + CommentReportEmail email = new CommentReportEmail(getLocale(), getTimeZone()); email.setPoll(poll); email.setTarget(comment); @@ -475,7 +481,7 @@ public class EmailService extends PollenServiceSupport { public CommentReportForAdminEmail newCommentReportForAdminEmail(Poll poll, Comment comment, Report report, PollenUser admin) { // FIXME BAVENCOFF 15/06/2017 la local du mail devrait etre celle du destinataire - CommentReportForAdminEmail email = new CommentReportForAdminEmail(getLocale()); + CommentReportForAdminEmail email = new CommentReportForAdminEmail(getLocale(), getTimeZone()); email.setPoll(poll); email.setTarget(comment); @@ -499,7 +505,7 @@ public class EmailService extends PollenServiceSupport { public ChoiceReportEmail newChoiceReportEmail(Poll poll, Choice choice, Report report) { // FIXME BAVENCOFF 15/06/2017 la local du mail devrait etre celle du destinataire - ChoiceReportEmail email = new ChoiceReportEmail(getLocale()); + ChoiceReportEmail email = new ChoiceReportEmail(getLocale(), getTimeZone()); email.setPoll(poll); email.setTarget(choice); email.setReport(report); @@ -517,7 +523,7 @@ public class EmailService extends PollenServiceSupport { public ChoiceReportForAdminEmail newChoiceReportForAdminEmail(Poll poll, Choice choice, Report report, PollenUser admin) { // FIXME BAVENCOFF 15/06/2017 la local du mail devrait etre celle du destinataire - ChoiceReportForAdminEmail email = new ChoiceReportForAdminEmail(getLocale()); + ChoiceReportForAdminEmail email = new ChoiceReportForAdminEmail(getLocale(), getTimeZone()); email.setPoll(poll); email.setTarget(choice); email.setReport(report); @@ -539,7 +545,7 @@ public class EmailService extends PollenServiceSupport { public PollReportEmail newPollReportEmail(Poll poll, Report report) { // FIXME BAVENCOFF 15/06/2017 la local du mail devrait etre celle du destinataire - PollReportEmail email = new PollReportEmail(getLocale()); + PollReportEmail email = new PollReportEmail(getLocale(), getTimeZone()); email.setPoll(poll); email.setTarget(poll); email.setReport(report); @@ -556,7 +562,7 @@ public class EmailService extends PollenServiceSupport { public PollReportForAdminEmail newPollReportForAdminEmail(Poll poll, Report report, PollenUser admin) { // FIXME BAVENCOFF 15/06/2017 la local du mail devrait etre celle du destinataire - PollReportForAdminEmail email = new PollReportForAdminEmail(getLocale()); + PollReportForAdminEmail email = new PollReportForAdminEmail(getLocale(), getTimeZone()); email.setPoll(poll); email.setTarget(poll); email.setReport(report); @@ -581,7 +587,7 @@ public class EmailService extends PollenServiceSupport { case DATE: case DATETIME: Date date = new Date(Long.parseLong(choice.getChoiceValue())); - value = PollenMail.formatDate(date, getLocale()); + value = PollenMail.formatDate(date, getLocale(), getTimeZone()); break; case RESOURCE: PollenResource resource = getPollenResourceDao().forTopiaIdEquals(choice.getChoiceValue()).findUnique(); @@ -597,7 +603,7 @@ public class EmailService extends PollenServiceSupport { } public FeedbackEmail newFeedbackMail(FeedbackBean feedbackBean, PollenUserBean user, Locale locale) { - FeedbackEmail email = new FeedbackEmail(locale); + FeedbackEmail email = new FeedbackEmail(locale, getTimeZone()); email.setUser(user); email.setFeedback(feedbackBean); email.setFeedbackDate(getNow()); diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/service/mail/FeedbackEmail.java b/pollen-services/src/main/java/org/chorem/pollen/services/service/mail/FeedbackEmail.java index 8f5c27b9..f5020d3c 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/service/mail/FeedbackEmail.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/service/mail/FeedbackEmail.java @@ -27,6 +27,7 @@ import org.nuiton.i18n.I18n; import java.util.Date; import java.util.Locale; +import java.util.TimeZone; /** * @author Sylvain Bavencoff - bavencoff@codelutin.com @@ -42,8 +43,8 @@ public class FeedbackEmail extends PollenMail { protected String applicationVersion; private String screenShotUrl; - public FeedbackEmail(Locale locale) { - super(locale); + public FeedbackEmail(Locale locale, TimeZone timeZone) { + super(locale, timeZone); } @Override diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/service/mail/LostPasswordEmail.java b/pollen-services/src/main/java/org/chorem/pollen/services/service/mail/LostPasswordEmail.java index 2c9fab11..67160c7c 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/service/mail/LostPasswordEmail.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/service/mail/LostPasswordEmail.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; /** * Created on 4/30/14. @@ -40,8 +41,8 @@ public class LostPasswordEmail extends PollenMail { private String url; - protected LostPasswordEmail(Locale locale) { - super(locale); + protected LostPasswordEmail(Locale locale, TimeZone timeZone) { + super(locale, timeZone); } public PollenUser getUser() { diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/service/mail/PollChoicePeriodEndedEmail.java b/pollen-services/src/main/java/org/chorem/pollen/services/service/mail/PollChoicePeriodEndedEmail.java index 9c52073d..7349c2f8 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/service/mail/PollChoicePeriodEndedEmail.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/service/mail/PollChoicePeriodEndedEmail.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. @@ -36,8 +37,8 @@ public class PollChoicePeriodEndedEmail extends PollenMail { protected Poll poll; - protected PollChoicePeriodEndedEmail(Locale locale) { - super(locale); + protected PollChoicePeriodEndedEmail(Locale locale, TimeZone timeZone) { + super(locale, timeZone); } @Override diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/service/mail/PollChoicePeriodStartedEmail.java b/pollen-services/src/main/java/org/chorem/pollen/services/service/mail/PollChoicePeriodStartedEmail.java index 7364af75..a43e4882 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/service/mail/PollChoicePeriodStartedEmail.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/service/mail/PollChoicePeriodStartedEmail.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. @@ -36,8 +37,8 @@ public class PollChoicePeriodStartedEmail extends PollenMail { protected Poll poll; - protected PollChoicePeriodStartedEmail(Locale locale) { - super(locale); + protected PollChoicePeriodStartedEmail(Locale locale, TimeZone timeZone) { + super(locale, timeZone); } @Override diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/service/mail/PollClosedEmail.java b/pollen-services/src/main/java/org/chorem/pollen/services/service/mail/PollClosedEmail.java index 56b869d6..6467c183 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/service/mail/PollClosedEmail.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/service/mail/PollClosedEmail.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. @@ -36,8 +37,8 @@ public class PollClosedEmail extends PollenMail { protected Poll poll; - protected PollClosedEmail(Locale locale) { - super(locale); + protected PollClosedEmail(Locale locale, TimeZone timeZone) { + super(locale, timeZone); } @Override diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/service/mail/PollCreatedEmail.java b/pollen-services/src/main/java/org/chorem/pollen/services/service/mail/PollCreatedEmail.java index f3758666..113a3735 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/service/mail/PollCreatedEmail.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/service/mail/PollCreatedEmail.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. @@ -39,8 +40,8 @@ public class PollCreatedEmail extends PollenMail { protected String pollenUrl; protected String url; - protected PollCreatedEmail(Locale locale) { - super(locale); + protected PollCreatedEmail(Locale locale, TimeZone timeZone) { + super(locale, timeZone); } @Override diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/service/mail/PollEndReminderEmail.java b/pollen-services/src/main/java/org/chorem/pollen/services/service/mail/PollEndReminderEmail.java index ecc8836a..313d5f54 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/service/mail/PollEndReminderEmail.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/service/mail/PollEndReminderEmail.java @@ -26,6 +26,7 @@ import org.nuiton.i18n.I18n; import java.text.DateFormat; import java.util.Locale; +import java.util.TimeZone; /** * @author Kevin Morin @@ -37,8 +38,8 @@ public class PollEndReminderEmail extends PollenMail { protected final DateFormat dateFormat; - public PollEndReminderEmail(Locale locale) { - super(locale); + public PollEndReminderEmail(Locale locale, TimeZone timeZone) { + super(locale, timeZone); dateFormat = DateFormat.getDateTimeInstance(DateFormat.SHORT, DateFormat.SHORT, locale); } diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/service/mail/PollInvitationEmail.java b/pollen-services/src/main/java/org/chorem/pollen/services/service/mail/PollInvitationEmail.java index acca6675..c66401d6 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/service/mail/PollInvitationEmail.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/service/mail/PollInvitationEmail.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. @@ -37,8 +38,8 @@ public class PollInvitationEmail extends PollenMail { protected Poll poll; private String voteUrl; - protected PollInvitationEmail(Locale locale) { - super(locale); + protected PollInvitationEmail(Locale locale, TimeZone timeZone) { + super(locale, timeZone); } @Override diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/service/mail/PollReportEmail.java b/pollen-services/src/main/java/org/chorem/pollen/services/service/mail/PollReportEmail.java index d361b622..3a6b2cb0 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/service/mail/PollReportEmail.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/service/mail/PollReportEmail.java @@ -25,14 +25,15 @@ import org.chorem.pollen.persistence.entity.Poll; import org.nuiton.i18n.I18n; import java.util.Locale; +import java.util.TimeZone; /** * @author Sylvain Bavencoff - bavencoff@codelutin.com */ public class PollReportEmail extends AbstractReportEmail<Poll> { - public PollReportEmail(Locale locale) { - super(locale); + public PollReportEmail(Locale locale, TimeZone timeZone) { + super(locale, timeZone); } @Override diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/service/mail/PollReportForAdminEmail.java b/pollen-services/src/main/java/org/chorem/pollen/services/service/mail/PollReportForAdminEmail.java index c77b338e..dc57e16f 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/service/mail/PollReportForAdminEmail.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/service/mail/PollReportForAdminEmail.java @@ -25,14 +25,15 @@ import org.chorem.pollen.persistence.entity.Poll; import org.nuiton.i18n.I18n; import java.util.Locale; +import java.util.TimeZone; /** * @author Sylvain Bavencoff - bavencoff@codelutin.com */ public class PollReportForAdminEmail extends AbstractReportForAdminEmail<Poll> { - public PollReportForAdminEmail(Locale locale) { - super(locale); + public PollReportForAdminEmail(Locale locale, TimeZone timeZone) { + super(locale, timeZone); } @Override diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/service/mail/PollVotePeriodEndedEmail.java b/pollen-services/src/main/java/org/chorem/pollen/services/service/mail/PollVotePeriodEndedEmail.java index 40da0996..dd58e61b 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/service/mail/PollVotePeriodEndedEmail.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/service/mail/PollVotePeriodEndedEmail.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. @@ -36,8 +37,8 @@ public class PollVotePeriodEndedEmail extends PollenMail { protected Poll poll; - protected PollVotePeriodEndedEmail(Locale locale) { - super(locale); + protected PollVotePeriodEndedEmail(Locale locale, TimeZone timeZone) { + super(locale, timeZone); } @Override diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/service/mail/PollVotePeriodStartedEmail.java b/pollen-services/src/main/java/org/chorem/pollen/services/service/mail/PollVotePeriodStartedEmail.java index 6dd0d529..698408ab 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/service/mail/PollVotePeriodStartedEmail.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/service/mail/PollVotePeriodStartedEmail.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. @@ -36,8 +37,8 @@ public class PollVotePeriodStartedEmail extends PollenMail { protected Poll poll; - protected PollVotePeriodStartedEmail(Locale locale) { - super(locale); + protected PollVotePeriodStartedEmail(Locale locale, TimeZone timeZone) { + super(locale, timeZone); } @Override diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/service/mail/PollVoteReminderEmail.java b/pollen-services/src/main/java/org/chorem/pollen/services/service/mail/PollVoteReminderEmail.java index 8ac1e1f3..5e344499 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/service/mail/PollVoteReminderEmail.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/service/mail/PollVoteReminderEmail.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. @@ -36,8 +37,8 @@ public class PollVoteReminderEmail extends PollenMail { protected Poll poll; - protected PollVoteReminderEmail(Locale locale) { - super(locale); + protected PollVoteReminderEmail(Locale locale, TimeZone timeZone) { + super(locale, timeZone); } @Override 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 38b7f734..66f30ce5 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 @@ -29,6 +29,7 @@ import java.text.DateFormat; import java.util.Date; import java.util.Locale; import java.util.Set; +import java.util.TimeZone; /** * Created on 4/30/14. @@ -38,10 +39,11 @@ import java.util.Set; */ public abstract class PollenMail { - public static String formatDate(Date date, Locale locale) { + public static String formatDate(Date date, Locale locale, TimeZone timeZone) { String result = null; if (date != null) { DateFormat formatter = DateFormat.getDateTimeInstance(DateFormat.LONG, DateFormat.SHORT, locale); + formatter.setTimeZone(timeZone); result = formatter.format(date); } return result; @@ -49,14 +51,17 @@ public abstract class PollenMail { protected final Locale locale; + protected final TimeZone timeZone; + protected Set<String> tos; protected Set<String> bccs; protected String signing; - public PollenMail(Locale locale) { + public PollenMail(Locale locale, TimeZone timeZone) { this.locale = locale; + this.timeZone = timeZone; } public Locale getLocale() { @@ -98,7 +103,7 @@ public abstract class PollenMail { } protected String formatDate(Date date) { - return formatDate(date, locale); + return formatDate(date, locale, timeZone); } public String getSigning() { diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/service/mail/ResendValidationEmail.java b/pollen-services/src/main/java/org/chorem/pollen/services/service/mail/ResendValidationEmail.java index 97de0fd2..ddbc9321 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/service/mail/ResendValidationEmail.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/service/mail/ResendValidationEmail.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; /** * Created on 4/30/14. @@ -39,8 +40,8 @@ public class ResendValidationEmail extends PollenMail { private String validateUrl; private String pollenUrl; - protected ResendValidationEmail(Locale locale) { - super(locale); + protected ResendValidationEmail(Locale locale, TimeZone timeZone) { + super(locale, timeZone); } @Override diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/service/mail/RestrictedPollInvitationEmail.java b/pollen-services/src/main/java/org/chorem/pollen/services/service/mail/RestrictedPollInvitationEmail.java index 32b15792..7e4ea728 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/service/mail/RestrictedPollInvitationEmail.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/service/mail/RestrictedPollInvitationEmail.java @@ -26,6 +26,7 @@ import org.chorem.pollen.persistence.entity.PollenPrincipal; import org.nuiton.i18n.I18n; import java.util.Locale; +import java.util.TimeZone; /** * Created on 4/30/14. @@ -41,8 +42,8 @@ public class RestrictedPollInvitationEmail extends PollenMail { private String voteUrl; private String token; - protected RestrictedPollInvitationEmail(Locale locale) { - super(locale); + protected RestrictedPollInvitationEmail(Locale locale, TimeZone timeZone) { + super(locale, timeZone); } @Override diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/service/mail/UserAccountCreatedEmail.java b/pollen-services/src/main/java/org/chorem/pollen/services/service/mail/UserAccountCreatedEmail.java index b18979bc..6f88a6ba 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/service/mail/UserAccountCreatedEmail.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/service/mail/UserAccountCreatedEmail.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; /** * Created on 4/30/14. @@ -40,8 +41,8 @@ public class UserAccountCreatedEmail extends PollenMail { private String pollenUrl; private String password; - protected UserAccountCreatedEmail(Locale locale) { - super(locale); + protected UserAccountCreatedEmail(Locale locale, TimeZone timeZone) { + super(locale, timeZone); } @Override diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/service/mail/UserAccountCreatedFromProviderEmail.java b/pollen-services/src/main/java/org/chorem/pollen/services/service/mail/UserAccountCreatedFromProviderEmail.java index 8f7adec3..766a2adf 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/service/mail/UserAccountCreatedFromProviderEmail.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/service/mail/UserAccountCreatedFromProviderEmail.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; /** * Created on 4/30/14. @@ -38,8 +39,8 @@ public class UserAccountCreatedFromProviderEmail extends PollenMail { private String provider; private String profileUrl; - protected UserAccountCreatedFromProviderEmail(Locale locale) { - super(locale); + protected UserAccountCreatedFromProviderEmail(Locale locale, TimeZone timeZone) { + super(locale, timeZone); } @Override diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/service/mail/UserAccountDeletedEmail.java b/pollen-services/src/main/java/org/chorem/pollen/services/service/mail/UserAccountDeletedEmail.java index c5d1b444..2e4f759b 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/service/mail/UserAccountDeletedEmail.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/service/mail/UserAccountDeletedEmail.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@kevinmorin.net @@ -34,8 +35,8 @@ public class UserAccountDeletedEmail extends PollenMail { private PollenUser user; - protected UserAccountDeletedEmail(Locale locale) { - super(locale); + protected UserAccountDeletedEmail(Locale locale, TimeZone timeZone) { + super(locale, timeZone); } @Override diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/service/mail/UserAccountEditedEmail.java b/pollen-services/src/main/java/org/chorem/pollen/services/service/mail/UserAccountEditedEmail.java index 6ec43bce..71d0adde 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/service/mail/UserAccountEditedEmail.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/service/mail/UserAccountEditedEmail.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@kevinmorin.net @@ -37,8 +38,8 @@ public class UserAccountEditedEmail extends PollenMail { private String pollenUrl; private String password; - protected UserAccountEditedEmail(Locale locale) { - super(locale); + protected UserAccountEditedEmail(Locale locale, TimeZone timeZone) { + super(locale, timeZone); } @Override diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/service/mail/UserAccountEmailValidatedEmail.java b/pollen-services/src/main/java/org/chorem/pollen/services/service/mail/UserAccountEmailValidatedEmail.java index ea825395..169514be 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/service/mail/UserAccountEmailValidatedEmail.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/service/mail/UserAccountEmailValidatedEmail.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@kevinmorin.net @@ -38,8 +39,8 @@ public class UserAccountEmailValidatedEmail extends PollenMail { private String pollenUrl; private String password; - protected UserAccountEmailValidatedEmail(Locale locale) { - super(locale); + protected UserAccountEmailValidatedEmail(Locale locale, TimeZone timeZone) { + super(locale, timeZone); } @Override diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/service/mail/UserAccountPasswordChangedEmail.java b/pollen-services/src/main/java/org/chorem/pollen/services/service/mail/UserAccountPasswordChangedEmail.java index 5036ee31..06a90895 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/service/mail/UserAccountPasswordChangedEmail.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/service/mail/UserAccountPasswordChangedEmail.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@kevinmorin.net @@ -38,8 +39,8 @@ public class UserAccountPasswordChangedEmail extends PollenMail { private String pollenUrl; private String password; - protected UserAccountPasswordChangedEmail(Locale locale) { - super(locale); + protected UserAccountPasswordChangedEmail(Locale locale, TimeZone timeZone) { + super(locale, timeZone); } @Override diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/service/mail/VoteAddedEmail.java b/pollen-services/src/main/java/org/chorem/pollen/services/service/mail/VoteAddedEmail.java index 20d6725e..1e418cee 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/service/mail/VoteAddedEmail.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/service/mail/VoteAddedEmail.java @@ -26,6 +26,7 @@ import org.chorem.pollen.persistence.entity.Vote; import org.nuiton.i18n.I18n; import java.util.Locale; +import java.util.TimeZone; /** * Created on 4/30/14. @@ -35,8 +36,8 @@ import java.util.Locale; */ public class VoteAddedEmail extends AbstractVoteEmail { - protected VoteAddedEmail(Locale locale, Poll poll, Vote vote) { - super(locale, poll, vote); + protected VoteAddedEmail(Locale locale, TimeZone timeZone, Poll poll, Vote vote) { + super(locale, timeZone, poll, vote); } @Override diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/service/mail/VoteDeletedEmail.java b/pollen-services/src/main/java/org/chorem/pollen/services/service/mail/VoteDeletedEmail.java index 3fa17def..cdc8992a 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/service/mail/VoteDeletedEmail.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/service/mail/VoteDeletedEmail.java @@ -26,6 +26,7 @@ import org.chorem.pollen.persistence.entity.Vote; import org.nuiton.i18n.I18n; import java.util.Locale; +import java.util.TimeZone; /** * Created on 4/30/14. @@ -35,8 +36,8 @@ import java.util.Locale; */ public class VoteDeletedEmail extends AbstractVoteEmail { - protected VoteDeletedEmail(Locale locale, Poll poll, Vote vote) { - super(locale, poll, vote); + protected VoteDeletedEmail(Locale locale, TimeZone timeZone, Poll poll, Vote vote) { + super(locale, timeZone, poll, vote); } @Override diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/service/mail/VoteEditedEmail.java b/pollen-services/src/main/java/org/chorem/pollen/services/service/mail/VoteEditedEmail.java index cb3b22b9..50bf4a58 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/service/mail/VoteEditedEmail.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/service/mail/VoteEditedEmail.java @@ -26,6 +26,7 @@ import org.chorem.pollen.persistence.entity.Vote; import org.nuiton.i18n.I18n; import java.util.Locale; +import java.util.TimeZone; /** * Created on 4/30/14. @@ -35,8 +36,8 @@ import java.util.Locale; */ public class VoteEditedEmail extends AbstractVoteEmail { - protected VoteEditedEmail(Locale locale, Poll poll, Vote vote) { - super(locale, poll, vote); + protected VoteEditedEmail(Locale locale, TimeZone timeZone, Poll poll, Vote vote) { + super(locale, timeZone, poll, vote); } @Override diff --git a/pollen-services/src/main/resources/i18n/pollen-services_en_GB.properties b/pollen-services/src/main/resources/i18n/pollen-services_en_GB.properties index b41d405e..91b3a122 100644 --- a/pollen-services/src/main/resources/i18n/pollen-services_en_GB.properties +++ b/pollen-services/src/main/resources/i18n/pollen-services_en_GB.properties @@ -17,6 +17,7 @@ pollen.configuration.defaultPollType=Default Poll type used when creating a new pollen.configuration.defaultPollVoteVisibility=Default Poll vote visibility used when creating a new poll pollen.configuration.defaultPollenUserPageSize=Default number of users per pages pollen.configuration.defaultResultVisibility=Default Result visibility +pollen.configuration.defaultTimeZoneId=Default timeZone pollen.configuration.defaultVoteCountingType=Default vote counting type used when creating a new poll pollen.configuration.defaultVoteNotification=Default notification type for the votes of a poll pollen.configuration.defaultVotePageSize=Default number of vote per page diff --git a/pollen-services/src/main/resources/i18n/pollen-services_fr_FR.properties b/pollen-services/src/main/resources/i18n/pollen-services_fr_FR.properties index 2a17b57e..c8bcf427 100644 --- a/pollen-services/src/main/resources/i18n/pollen-services_fr_FR.properties +++ b/pollen-services/src/main/resources/i18n/pollen-services_fr_FR.properties @@ -17,6 +17,7 @@ pollen.configuration.defaultPollType=Type de sondage par défaut lors de la cré pollen.configuration.defaultPollVoteVisibility=Visibilité des votes par défaut lors de la création d'un nouveau sondage pollen.configuration.defaultPollenUserPageSize=Nombre d'utilisateurs par page pollen.configuration.defaultResultVisibility=Visibilité des résultats par défaut +pollen.configuration.defaultTimeZoneId=Fuseau horaire par défaut pollen.configuration.defaultVoteCountingType=Type de dépouillement par défaut lors de la création d'un nouveau sondage pollen.configuration.defaultVoteNotification=Type de notification par défaut pour les votes pollen.configuration.defaultVotePageSize=Nombre de votes par page -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
participants (1)
-
chorem.org scm