[Pollen-commits] 04/04: Ajout des mails manquants

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 2fd99578531d2c93a17d01c4d1672a8cac283c58 Author: Kevin Morin <morin@codelutin.com> Date: Tue Jun 6 17:15:23 2017 +0200 Ajout des mails manquants --- .../services/service/NotificationService.java | 82 +++++++++++++-------- .../pollen/services/service/PollenUserService.java | 2 +- .../pollen/services/service/mail/EmailService.java | 24 +++++++ .../service/mail/UserAccountDeletedEmail.java | 56 +++++++++++++++ .../service/mail/UserAccountEditedEmail.java | 75 +++++++++++++++++++ .../mail/UserAccountEmailValidatedEmail.java | 84 ++++++++++++++++++++++ .../mail/UserAccountPasswordChangedEmail.java | 84 ++++++++++++++++++++++ .../main/resources/email/ChoiceAddedEmail.mustache | 3 + .../resources/email/ChoiceAddedEmail_fr.mustache | 3 + .../resources/email/CommentAddedEmail.mustache | 3 + .../resources/email/CommentAddedEmail_fr.mustache | 3 + .../resources/email/CommentDeletedEmail.mustache | 3 + .../email/CommentDeletedEmail_fr.mustache | 3 + .../resources/email/CommentEditedEmail.mustache | 3 + .../resources/email/CommentEditedEmail_fr.mustache | 3 + .../email/UserAccountCreatedEmail.mustache | 2 +- .../email/UserAccountDeletedEmail.mustache | 3 + .../email/UserAccountDeletedEmail_fr.mustache | 3 + .../email/UserAccountEditedEmail.mustache | 6 ++ .../email/UserAccountEditedEmail_fr.mustache | 6 ++ .../email/UserAccountEmailValidatedEmail.mustache | 3 + .../UserAccountEmailValidatedEmail_fr.mustache | 3 + .../email/UserAccountPasswordChangedEmail.mustache | 3 + .../UserAccountPasswordChangedEmail_fr.mustache | 3 + .../i18n/pollen-services_en_GB.properties | 4 ++ .../i18n/pollen-services_fr_FR.properties | 6 +- 26 files changed, 439 insertions(+), 34 deletions(-) diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/service/NotificationService.java b/pollen-services/src/main/java/org/chorem/pollen/services/service/NotificationService.java index 54adbbfd..71875890 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/service/NotificationService.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/service/NotificationService.java @@ -32,6 +32,10 @@ import org.chorem.pollen.persistence.entity.Vote; import org.chorem.pollen.persistence.entity.VoterList; import org.chorem.pollen.persistence.entity.VoterListMember; import org.chorem.pollen.services.PollenUIContext; +import org.chorem.pollen.services.service.mail.ChoiceAddedEmail; +import org.chorem.pollen.services.service.mail.CommentAddedEmail; +import org.chorem.pollen.services.service.mail.CommentDeletedEmail; +import org.chorem.pollen.services.service.mail.CommentEditedEmail; import org.chorem.pollen.services.service.mail.EmailService; import org.chorem.pollen.services.service.mail.LostPasswordEmail; import org.chorem.pollen.services.service.mail.PollClosedEmail; @@ -41,6 +45,10 @@ import org.chorem.pollen.services.service.mail.PollInvitationEmail; import org.chorem.pollen.services.service.mail.ResendValidationEmail; import org.chorem.pollen.services.service.mail.RestrictedPollInvitationEmail; import org.chorem.pollen.services.service.mail.UserAccountCreatedEmail; +import org.chorem.pollen.services.service.mail.UserAccountDeletedEmail; +import org.chorem.pollen.services.service.mail.UserAccountEditedEmail; +import org.chorem.pollen.services.service.mail.UserAccountEmailValidatedEmail; +import org.chorem.pollen.services.service.mail.UserAccountPasswordChangedEmail; import org.chorem.pollen.services.service.mail.VoteAddedEmail; import org.chorem.pollen.services.service.mail.VoteDeletedEmail; import org.chorem.pollen.services.service.mail.VoteEditedEmail; @@ -57,63 +65,70 @@ import java.util.Set; public class NotificationService extends PollenServiceSupport { public void onUserCreated(PollenUser user, PollenUIContext pollenUIContext) { - EmailService emailService = getEmailService(); UserAccountCreatedEmail email = emailService.newUserAccountCreatedEmail(user, pollenUIContext); - email.addTo(user.getEmail()); - emailService.send(email); - } public void onResendValidation(PollenUser user, PollenUIContext pollenUIContext) { - EmailService emailService = getEmailService(); ResendValidationEmail email = emailService.newUserResendValidationEmail(user, pollenUIContext); - email.addTo(user.getEmail()); emailService.send(email); - } public void onUserEdited(PollenUser user) { - // TODO + EmailService emailService = getEmailService(); + UserAccountEditedEmail email = emailService.newUserAccountEditedEmail(user); + email.addTo(user.getEmail()); + emailService.send(email); } public void onUserDeleted(PollenUser user) { - // TODO + EmailService emailService = getEmailService(); + UserAccountDeletedEmail email = emailService.newUserAccountDeletedEmail(user); + email.addTo(user.getEmail()); + emailService.send(email); } - public void onUserPasswordChanged(PollenUser user, String newPassword) { - // TODO + public void onUserPasswordChanged(PollenUser user) { + EmailService emailService = getEmailService(); + UserAccountPasswordChangedEmail email = emailService.newUserAccountPasswordChangedEmail(user); + email.addTo(user.getEmail()); + emailService.send(email); } public void onUserEmailValidated(PollenUser user) { - // TODO + EmailService emailService = getEmailService(); + UserAccountEmailValidatedEmail email = emailService.newUserAccountEmailValidatedEmail(user); + email.addTo(user.getEmail()); + emailService.send(email); } public void onUserLostPasswordAsked(PollenUser user, String newPassword) { - EmailService emailService = getEmailService(); LostPasswordEmail email = emailService.newLostPasswordEmail(user, newPassword); - email.addTo(user.getEmail()); - emailService.send(email); - } public void onFavoriteListAdded(PollenUser user, FavoriteList favoriteList) { // TODO + // 170606 kmorin really ? + // do nothing for now } public void onFavoriteListEdited(PollenUser user, FavoriteList favoriteList) { // TODO + // 170606 kmorin really ? + // do nothing for now } public void onFavoriteListDeleted(PollenUser user, FavoriteList favoriteList) { // TODO + // 170606 kmorin really ? + // do nothing for now } public void onPollCreated(Poll poll) { @@ -165,56 +180,61 @@ public class NotificationService extends PollenServiceSupport { if (PollType.FREE.equals(poll.getPollType()) ) { for (String email : newParticipants) { PollInvitationEmail mail = emailService.newPollInvitationEmail(poll); - mail.addTo(email); - emailService.send(mail); } } - } public void onPollDeleted(Poll poll) { - + // do nothing for now } public void onPollClosed(Poll poll) { - EmailService emailService = getEmailService(); PollClosedEmail email = emailService.newPollClosedEmail(poll); - //email.addTo(poll.getCreator().getEmail()); - emailService.send(email); - } public void onPollReopened(Poll poll) { - + // do nothing for now } public void onChoiceAdded(Poll poll, Choice choice) { - // TODO + EmailService emailService = getEmailService(); + ChoiceAddedEmail email = emailService.newChoiceAddedEmail(poll, choice); + email.addTo(poll.getCreator().getEmail()); + emailService.send(email); } public void onChoiceEdited(Poll poll, Choice choice) { - + // do nothing for now } public void onChoiceDeleted(Poll poll, Choice choice) { - + // do nothing for now } public void onCommentAdded(Poll poll, Comment comment) { - // TODO + EmailService emailService = getEmailService(); + CommentAddedEmail email = emailService.newCommentAddedEmail(poll, comment); + email.addTo(poll.getCreator().getEmail()); + emailService.send(email); } public void onCommentEdited(Poll poll, Comment comment) { - // TODO + EmailService emailService = getEmailService(); + CommentEditedEmail email = emailService.newCommentEditedEmail(poll, comment); + email.addTo(poll.getCreator().getEmail()); + emailService.send(email); } public void onCommentDeleted(Poll poll, Comment comment) { - // TODO + EmailService emailService = getEmailService(); + CommentDeletedEmail email = emailService.newCommentDeletedEmail(poll, comment); + email.addTo(poll.getCreator().getEmail()); + emailService.send(email); } public void onVoteAdded(Poll poll, Vote vote) { diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/service/PollenUserService.java b/pollen-services/src/main/java/org/chorem/pollen/services/service/PollenUserService.java index ec36fb96..7be28756 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/service/PollenUserService.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/service/PollenUserService.java @@ -230,7 +230,7 @@ public class PollenUserService extends PollenServiceSupport implements PollenSer commit(); - getNotificationService().onUserPasswordChanged(user, newPassword); + getNotificationService().onUserPasswordChanged(user); } 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 6dc4ebac..71bdfa9c 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 @@ -194,6 +194,24 @@ public class EmailService extends PollenServiceSupport { return email; } + public UserAccountEditedEmail newUserAccountEditedEmail(PollenUser user) { + UserAccountEditedEmail email = new UserAccountEditedEmail(getLocale()); + email.setUser(user); + return email; + } + + public UserAccountDeletedEmail newUserAccountDeletedEmail(PollenUser user) { + UserAccountDeletedEmail email = new UserAccountDeletedEmail(getLocale()); + email.setUser(user); + return email; + } + + public UserAccountEmailValidatedEmail newUserAccountEmailValidatedEmail(PollenUser user) { + UserAccountEmailValidatedEmail email = new UserAccountEmailValidatedEmail(getLocale()); + email.setUser(user); + return email; + } + public ResendValidationEmail newUserResendValidationEmail(PollenUser user, PollenUIContext pollenUIContext) { ResendValidationEmail email = new ResendValidationEmail(getLocale()); email.setUser(user); @@ -207,6 +225,12 @@ public class EmailService extends PollenServiceSupport { return email; } + public UserAccountPasswordChangedEmail newUserAccountPasswordChangedEmail(PollenUser user) { + UserAccountPasswordChangedEmail email = new UserAccountPasswordChangedEmail(getLocale()); + email.setUser(user); + return email; + } + public LostPasswordEmail newLostPasswordEmail(PollenUser user, String password) { LostPasswordEmail email = new LostPasswordEmail(getLocale()); email.setUser(user); 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 new file mode 100644 index 00000000..c5d1b444 --- /dev/null +++ b/pollen-services/src/main/java/org/chorem/pollen/services/service/mail/UserAccountDeletedEmail.java @@ -0,0 +1,56 @@ +package org.chorem.pollen.services.service.mail; + +/* + * #%L + * Pollen :: Service + * %% + * Copyright (C) 2009 - 2017 Code Lutin, Tony Chemit + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ + +import org.chorem.pollen.persistence.entity.PollenUser; +import org.nuiton.i18n.I18n; + +import java.util.Locale; + +/** + * @author Kevin Morin - morin@kevinmorin.net + * @since 3.0 + */ +public class UserAccountDeletedEmail extends PollenMail { + + private PollenUser user; + + protected UserAccountDeletedEmail(Locale locale) { + super(locale); + } + + @Override + public String getSubject() { + if (user.getName() == null) { + return I18n.l(locale, "pollen.service.mail.UserAccountDeletedEmail.subject", user.getEmail()); + } + return I18n.l(locale, "pollen.service.mail.UserAccountDeletedEmail.subject", user.getName()); + } + + public PollenUser getUser() { + return user; + } + + public void setUser(PollenUser user) { + this.user = user; + } +} 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 new file mode 100644 index 00000000..6ec43bce --- /dev/null +++ b/pollen-services/src/main/java/org/chorem/pollen/services/service/mail/UserAccountEditedEmail.java @@ -0,0 +1,75 @@ +package org.chorem.pollen.services.service.mail; + +/* + * #%L + * Pollen :: Service + * %% + * Copyright (C) 2009 - 2017 Code Lutin, Tony Chemit + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ + +import org.chorem.pollen.persistence.entity.PollenUser; +import org.nuiton.i18n.I18n; + +import java.util.Locale; + +/** + * @author Kevin Morin - morin@kevinmorin.net + * @since 3.0 + */ +public class UserAccountEditedEmail extends PollenMail { + + private PollenUser user; + + private String pollenUrl; + private String password; + + protected UserAccountEditedEmail(Locale locale) { + super(locale); + } + + @Override + public String getSubject() { + if (user.getName() == null) { + return I18n.l(locale, "pollen.service.mail.UserAccountEditedEmail.subject", user.getEmail()); + } + return I18n.l(locale, "pollen.service.mail.UserAccountEditedEmail.subject", user.getName()); + } + + public PollenUser getUser() { + return user; + } + + public void setUser(PollenUser user) { + this.user = user; + } + + public String getPollenUrl() { + return pollenUrl; + } + + public void setPollenUrl(String pollenUrl) { + this.pollenUrl = pollenUrl; + } + + public String getPassword() { + return password; + } + + public void setPassword(String password) { + this.password = password; + } +} 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 new file mode 100644 index 00000000..ea825395 --- /dev/null +++ b/pollen-services/src/main/java/org/chorem/pollen/services/service/mail/UserAccountEmailValidatedEmail.java @@ -0,0 +1,84 @@ +package org.chorem.pollen.services.service.mail; + +/* + * #%L + * Pollen :: Service + * %% + * Copyright (C) 2009 - 2017 Code Lutin, Tony Chemit + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ + +import org.chorem.pollen.persistence.entity.PollenUser; +import org.nuiton.i18n.I18n; + +import java.util.Locale; + +/** + * @author Kevin Morin - morin@kevinmorin.net + * @since 3.0 + */ +public class UserAccountEmailValidatedEmail extends PollenMail { + + private PollenUser user; + + private String validateUrl; + private String pollenUrl; + private String password; + + protected UserAccountEmailValidatedEmail(Locale locale) { + super(locale); + } + + @Override + public String getSubject() { + if (user.getName() == null) { + return I18n.l(locale, "pollen.service.mail.UserAccountEmailValidatedEmail.subject", user.getEmail()); + } + return I18n.l(locale, "pollen.service.mail.UserAccountEmailValidatedEmail.subject", user.getName()); + } + + public PollenUser getUser() { + return user; + } + + public void setUser(PollenUser user) { + this.user = user; + } + + public String getValidateUrl() { + return validateUrl; + } + + public void setValidateUrl(String validateUrl) { + this.validateUrl = validateUrl; + } + + public String getPollenUrl() { + return pollenUrl; + } + + public void setPollenUrl(String pollenUrl) { + this.pollenUrl = pollenUrl; + } + + public String getPassword() { + return password; + } + + public void setPassword(String password) { + this.password = password; + } +} 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 new file mode 100644 index 00000000..5036ee31 --- /dev/null +++ b/pollen-services/src/main/java/org/chorem/pollen/services/service/mail/UserAccountPasswordChangedEmail.java @@ -0,0 +1,84 @@ +package org.chorem.pollen.services.service.mail; + +/* + * #%L + * Pollen :: Service + * %% + * Copyright (C) 2009 - 2017 Code Lutin, Tony Chemit + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ + +import org.chorem.pollen.persistence.entity.PollenUser; +import org.nuiton.i18n.I18n; + +import java.util.Locale; + +/** + * @author Kevin Morin - morin@kevinmorin.net + * @since 3.0 + */ +public class UserAccountPasswordChangedEmail extends PollenMail { + + private PollenUser user; + + private String validateUrl; + private String pollenUrl; + private String password; + + protected UserAccountPasswordChangedEmail(Locale locale) { + super(locale); + } + + @Override + public String getSubject() { + if (user.getName() == null) { + return I18n.l(locale, "pollen.service.mail.UserAccountPasswordChangedEmail.subject", user.getEmail()); + } + return I18n.l(locale, "pollen.service.mail.UserAccountPasswordChangedEmail.subject", user.getName()); + } + + public PollenUser getUser() { + return user; + } + + public void setUser(PollenUser user) { + this.user = user; + } + + public String getValidateUrl() { + return validateUrl; + } + + public void setValidateUrl(String validateUrl) { + this.validateUrl = validateUrl; + } + + public String getPollenUrl() { + return pollenUrl; + } + + public void setPollenUrl(String pollenUrl) { + this.pollenUrl = pollenUrl; + } + + public String getPassword() { + return password; + } + + public void setPassword(String password) { + this.password = password; + } +} diff --git a/pollen-services/src/main/resources/email/ChoiceAddedEmail.mustache b/pollen-services/src/main/resources/email/ChoiceAddedEmail.mustache new file mode 100644 index 00000000..462e12ed --- /dev/null +++ b/pollen-services/src/main/resources/email/ChoiceAddedEmail.mustache @@ -0,0 +1,3 @@ +Hello {{poll.creator.name}}, + +A choice has been added to the poll "{{poll.title}}". \ No newline at end of file diff --git a/pollen-services/src/main/resources/email/ChoiceAddedEmail_fr.mustache b/pollen-services/src/main/resources/email/ChoiceAddedEmail_fr.mustache new file mode 100644 index 00000000..d91656b9 --- /dev/null +++ b/pollen-services/src/main/resources/email/ChoiceAddedEmail_fr.mustache @@ -0,0 +1,3 @@ +Bonjour {{poll.creator.name}}, + +Un choix a été ajouté à votre sondage "{{poll.title}}". \ No newline at end of file diff --git a/pollen-services/src/main/resources/email/CommentAddedEmail.mustache b/pollen-services/src/main/resources/email/CommentAddedEmail.mustache new file mode 100644 index 00000000..80ba9f5c --- /dev/null +++ b/pollen-services/src/main/resources/email/CommentAddedEmail.mustache @@ -0,0 +1,3 @@ +Hello {{poll.creator.name}}, + +A comment has been added to the poll "{{poll.title}}". \ No newline at end of file diff --git a/pollen-services/src/main/resources/email/CommentAddedEmail_fr.mustache b/pollen-services/src/main/resources/email/CommentAddedEmail_fr.mustache new file mode 100644 index 00000000..06a1682e --- /dev/null +++ b/pollen-services/src/main/resources/email/CommentAddedEmail_fr.mustache @@ -0,0 +1,3 @@ +Bonjour {{poll.creator.name}}, + +Un commentaire a été ajouté au sondage "{{poll.title}}". \ No newline at end of file diff --git a/pollen-services/src/main/resources/email/CommentDeletedEmail.mustache b/pollen-services/src/main/resources/email/CommentDeletedEmail.mustache new file mode 100644 index 00000000..322178da --- /dev/null +++ b/pollen-services/src/main/resources/email/CommentDeletedEmail.mustache @@ -0,0 +1,3 @@ +Hello {{poll.creator.name}}, + +A comment has been deleted from the poll "{{poll.title}}". \ No newline at end of file diff --git a/pollen-services/src/main/resources/email/CommentDeletedEmail_fr.mustache b/pollen-services/src/main/resources/email/CommentDeletedEmail_fr.mustache new file mode 100644 index 00000000..6aac8695 --- /dev/null +++ b/pollen-services/src/main/resources/email/CommentDeletedEmail_fr.mustache @@ -0,0 +1,3 @@ +Bonjour {{poll.creator.name}}, + +Un commentaire a été supprimé du sondage "{{poll.title}}". \ No newline at end of file diff --git a/pollen-services/src/main/resources/email/CommentEditedEmail.mustache b/pollen-services/src/main/resources/email/CommentEditedEmail.mustache new file mode 100644 index 00000000..febef8aa --- /dev/null +++ b/pollen-services/src/main/resources/email/CommentEditedEmail.mustache @@ -0,0 +1,3 @@ +Hello {{poll.creator.name}}, + +A comment has been edited on the poll "{{poll.title}}". \ No newline at end of file diff --git a/pollen-services/src/main/resources/email/CommentEditedEmail_fr.mustache b/pollen-services/src/main/resources/email/CommentEditedEmail_fr.mustache new file mode 100644 index 00000000..11ca75f8 --- /dev/null +++ b/pollen-services/src/main/resources/email/CommentEditedEmail_fr.mustache @@ -0,0 +1,3 @@ +Bonjour {{poll.creator.name}}, + +Un commentaire a été édité sur le sondage "{{poll.title}}". \ No newline at end of file diff --git a/pollen-services/src/main/resources/email/UserAccountCreatedEmail.mustache b/pollen-services/src/main/resources/email/UserAccountCreatedEmail.mustache index 87091260..eb5e4943 100644 --- a/pollen-services/src/main/resources/email/UserAccountCreatedEmail.mustache +++ b/pollen-services/src/main/resources/email/UserAccountCreatedEmail.mustache @@ -1,6 +1,6 @@ Welcome {{user.name}}, -You had just created an account on the web application Pollen. +You have just created an account on the web application Pollen. Email: {{user.email}} diff --git a/pollen-services/src/main/resources/email/UserAccountDeletedEmail.mustache b/pollen-services/src/main/resources/email/UserAccountDeletedEmail.mustache new file mode 100644 index 00000000..2cc7c030 --- /dev/null +++ b/pollen-services/src/main/resources/email/UserAccountDeletedEmail.mustache @@ -0,0 +1,3 @@ +Hello {{user.name}}, + +Your Pollen account has successfully been deleted. \ No newline at end of file diff --git a/pollen-services/src/main/resources/email/UserAccountDeletedEmail_fr.mustache b/pollen-services/src/main/resources/email/UserAccountDeletedEmail_fr.mustache new file mode 100644 index 00000000..3e7be193 --- /dev/null +++ b/pollen-services/src/main/resources/email/UserAccountDeletedEmail_fr.mustache @@ -0,0 +1,3 @@ +Bonjour {{user.name}}, + +Votre compte a bien été supprimé. \ No newline at end of file diff --git a/pollen-services/src/main/resources/email/UserAccountEditedEmail.mustache b/pollen-services/src/main/resources/email/UserAccountEditedEmail.mustache new file mode 100644 index 00000000..58c3c022 --- /dev/null +++ b/pollen-services/src/main/resources/email/UserAccountEditedEmail.mustache @@ -0,0 +1,6 @@ +Hello {{user.name}}, + +Your Pollen account has been updated: + +name: {{user.name}} +email: {{user.email}} \ No newline at end of file diff --git a/pollen-services/src/main/resources/email/UserAccountEditedEmail_fr.mustache b/pollen-services/src/main/resources/email/UserAccountEditedEmail_fr.mustache new file mode 100644 index 00000000..ee5c530a --- /dev/null +++ b/pollen-services/src/main/resources/email/UserAccountEditedEmail_fr.mustache @@ -0,0 +1,6 @@ +Bonjour {{user.name}}, + +Votre compte Pollen a été mis à jour : + +nom : {{user.name}} +email : {{user.email}} \ No newline at end of file diff --git a/pollen-services/src/main/resources/email/UserAccountEmailValidatedEmail.mustache b/pollen-services/src/main/resources/email/UserAccountEmailValidatedEmail.mustache new file mode 100644 index 00000000..f04a0dba --- /dev/null +++ b/pollen-services/src/main/resources/email/UserAccountEmailValidatedEmail.mustache @@ -0,0 +1,3 @@ +Hello {{user.name}}, + +Your email address has successfully been validated. \ No newline at end of file diff --git a/pollen-services/src/main/resources/email/UserAccountEmailValidatedEmail_fr.mustache b/pollen-services/src/main/resources/email/UserAccountEmailValidatedEmail_fr.mustache new file mode 100644 index 00000000..094dfa0e --- /dev/null +++ b/pollen-services/src/main/resources/email/UserAccountEmailValidatedEmail_fr.mustache @@ -0,0 +1,3 @@ +Bonjour {{user.name}}, + +Votre adresse email a été validée. \ No newline at end of file diff --git a/pollen-services/src/main/resources/email/UserAccountPasswordChangedEmail.mustache b/pollen-services/src/main/resources/email/UserAccountPasswordChangedEmail.mustache new file mode 100644 index 00000000..3cfb7b29 --- /dev/null +++ b/pollen-services/src/main/resources/email/UserAccountPasswordChangedEmail.mustache @@ -0,0 +1,3 @@ +Hello {{user.name}}, + +Your password has successfully been updated. \ No newline at end of file diff --git a/pollen-services/src/main/resources/email/UserAccountPasswordChangedEmail_fr.mustache b/pollen-services/src/main/resources/email/UserAccountPasswordChangedEmail_fr.mustache new file mode 100644 index 00000000..a0710c4e --- /dev/null +++ b/pollen-services/src/main/resources/email/UserAccountPasswordChangedEmail_fr.mustache @@ -0,0 +1,3 @@ +Bonjour {{user.name}}, + +Votre mot de passe a correctement été mis à jour. \ No newline at end of file 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 7b86cbd5..ac628b1a 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 @@ -133,6 +133,10 @@ pollen.service.mail.PollVoteReminderEmail.subject=[Pollen] Reminder to vote on p pollen.service.mail.ResendValidationEmail.subject=[Pollen] Invitation to validate your account %s pollen.service.mail.RestrictedPollInvitationEmail.subject=[Pollen] Invitation to vote on poll %s pollen.service.mail.UserAccountCreatedEmail.subject=[Pollen] Confirmation of account creation %s +pollen.service.mail.UserAccountDeletedEmail.subject=[Pollen] Confirmation of deletion of the account %s +pollen.service.mail.UserAccountEditedEmail.subject=[Pollen] Update of the account %s +pollen.service.mail.UserAccountEmailValidatedEmail.subject=[Pollen] Validation of your account %s +pollen.service.mail.UserAccountPasswordChangedEmail.subject=[Pollen] Confirmation of the modification of teh password of your account %s pollen.service.mail.VoteAddedEmail.subject=[Pollen] A vote was added in poll %s pollen.service.mail.VoteDeletedEmail.subject=[Pollen] A vote was deleted in poll %s pollen.service.mail.VoteEditedEmail.subject=[Pollen] A vote was edited in poll %s 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 7d57b9bd..b1f2958c 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 @@ -129,9 +129,13 @@ pollen.service.mail.PollEndReminderEmail.subject=[Pollen] Votre sondage %s se te pollen.service.mail.PollVotePeriodEndedEmail.subject=[Pollen] Période de vote terminée pour le sondage %s pollen.service.mail.PollVotePeriodStartedEmail.subject=[Pollen] Période de vote commencée pour le sondage %s pollen.service.mail.PollVoteReminderEmail.subject=[Pollen] Rappel du vote au sondage %s -pollen.service.mail.ResendValidationEmail.subject=[Pollen] Validation de votre compte %s +pollen.service.mail.ResendValidationEmail.subject=[Pollen] Validez votre compte %s pollen.service.mail.RestrictedPollInvitationEmail.subject=[Pollen] Invitation au sondage %s pollen.service.mail.UserAccountCreatedEmail.subject=[Pollen] Confirmation de création du compte %s +pollen.service.mail.UserAccountDeletedEmail.subject=[Pollen] Confirmation de suppression du compte %s +pollen.service.mail.UserAccountEditedEmail.subject=[Pollen] Édition du compte %s +pollen.service.mail.UserAccountEmailValidatedEmail.subject=[Pollen] Valiation de votre compte %s +pollen.service.mail.UserAccountPasswordChangedEmail.subject=[Pollen] Confirmation de la modification du mot de passe du compte %s pollen.service.mail.VoteAddedEmail.subject=[Pollen] Un nouveau vote a été ajouté au sondage %s pollen.service.mail.VoteDeletedEmail.subject=[Pollen] Un vote a été supprimé sur le sondage %s pollen.service.mail.VoteEditedEmail.subject=[Pollen] Un vote a été modifié du sondage %s -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.