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 814335a8beb42cb4c915d3a4c141b77cff35b005 Author: Kevin Morin <morin@codelutin.com> Date: Thu Jun 8 11:14:34 2017 +0200 refs #56 error message --- .../java/org/chorem/pollen/services/service/PollenUserService.java | 2 +- .../src/main/resources/i18n/pollen-services_en_GB.properties | 7 ++++--- .../src/main/resources/i18n/pollen-services_fr_FR.properties | 7 ++++--- 3 files changed, 9 insertions(+), 7 deletions(-) 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 58f7fc72..7516c3ef 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 @@ -333,7 +333,7 @@ public class PollenUserService extends PollenServiceSupport implements PollenSer checkValidEmail(errors, "email", userEmail, l(getLocale(), "pollen.error.user.mailInvalid")); - checkEmailPattern(errors, "email", userEmail, l(getLocale(), "pollen.error.user.mailInvalid")); + checkEmailPattern(errors, "email", userEmail, l(getLocale(), "pollen.error.user.mailUnauthorized")); if (userExists) { 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 ae82fd6d..c6c4e244 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 @@ -80,9 +80,10 @@ pollen.error.poll.voterList.mandatory.for.groupedPoll=At least one voter list in pollen.error.resource.empty=No resource sent pollen.error.resource.maxSize=File "%s" of %4.2f %s can't be over %4.2f %s. pollen.error.resource.notExist=Image don't exist -pollen.error.user.mailEmpty=email can not be empty -pollen.error.user.mailExist=email already exists -pollen.error.user.mailInvalid=email is not valid +pollen.error.user.mailEmpty=The email address can not be empty +pollen.error.user.mailExist=The email address already exists +pollen.error.user.mailInvalid=The email address is not valid +pollen.error.user.mailUnauthorized=The email address is not authorized pollen.error.user.passwordEmpty=password can not be empty pollen.error.user.passwordInvalid=password is not valid pollen.error.vote.limitedVote.overflow=Too many choices 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 5b242705..e3241be7 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 @@ -79,9 +79,10 @@ pollen.error.poll.voterList.mandatory.for.groupedPoll=Au moins une liste de vota pollen.error.resource.empty=Aucune resource envoyé pollen.error.resource.maxSize=Le fichier « %s » de %4.2f %s ne doit pas dépasser %4.2f %s. pollen.error.resource.notExist=L'image n'existe pas sur le serveur -pollen.error.user.mailEmpty=Courriel ne peut pas être vide -pollen.error.user.mailExist=Courriel existe déjà -pollen.error.user.mailInvalid=Courriel est invalide +pollen.error.user.mailEmpty=L'adresse de courriel ne peut pas être vide +pollen.error.user.mailExist=L'adresse de courriel existe déjà +pollen.error.user.mailInvalid=L'adresse de courriel est invalide +pollen.error.user.mailUnauthorized=L'adresse de courriel n'est pas autorisée pollen.error.user.passwordEmpty=Mot de passe ne peut pas être vide pollen.error.user.passwordInvalid=Mot de passe est invalide pollen.error.vote.limitedVote.overflow=Le nombre de choix maximal atteind -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.