This is an automated email from the git hooks/post-receive script. New commit to branch devel in repository pollen. See http://git.chorem.org/pollen.git commit 96ba3bf40b762cfa11bdeb920ce42598317d7343 Author: Adrien Garandel <a.garandel@dralagen.fr> Date: Mon Jun 2 12:01:01 2014 +0200 add translate (fr-en) in pollUserService --- .../chorem/pollen/services/service/PollenUserService.java | 14 ++++++++------ .../main/resources/i18n/pollen-services_en_GB.properties | 5 +++++ .../main/resources/i18n/pollen-services_fr_FR.properties | 5 +++++ .../src/main/webapp/partials/user-register.html | 4 ++++ 4 files changed, 22 insertions(+), 6 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 e7e3417..4191c45 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 @@ -40,6 +40,8 @@ import org.nuiton.util.pagination.PaginationResult; import java.util.Objects; +import static org.nuiton.i18n.I18n.l; + /** * TODO * @@ -204,11 +206,11 @@ public class PollenUserService extends PollenServiceSupport implements PollenSer String userEmail = getCleanMail(user.getEmail()); - boolean emailNotblank = checkNotBlank(errors, "email", userEmail, "email can not be empty"); + boolean emailNotblank = checkNotBlank(errors, "email", userEmail, l(getLocale(), "pollen.error.user.mailEmpty")); if (emailNotblank) { - checkValidEmail(errors, "email", userEmail, "email is not valid"); + checkValidEmail(errors, "email", userEmail, l(getLocale(), "pollen.error.user.mailInvalid")); if (userExists) { @@ -218,19 +220,19 @@ public class PollenUserService extends PollenServiceSupport implements PollenSer if (emailChanged) { - check(errors, "email", !dao.emailExists(userEmail), "email already exists"); + check(errors, "email", !dao.emailExists(userEmail), l(getLocale(), "pollen.error.user.mailExist")); } } else { - check(errors, "email", !dao.emailExists(userEmail), "email already exists"); + check(errors, "email", !dao.emailExists(userEmail), l(getLocale(), "pollen.error.user.mailExist")); } } - boolean passwordNotBlank = checkNotBlank(errors, "password", user.getPassword() , "password can not be empty"); + boolean passwordNotBlank = checkNotBlank(errors, "password", user.getPassword() , l(getLocale(), "pollen.error.user.passwordEmpty")); if (userExists && passwordNotBlank) { @@ -242,7 +244,7 @@ public class PollenUserService extends PollenServiceSupport implements PollenSer } catch (PollenInvalidPasswordException e) { - check(errors, "password", false, "invalid password"); + check(errors, "password", false, l(getLocale(), "pollen.error.user.passwordInvalid")); } 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 13c2595..aba2f45 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 @@ -28,6 +28,11 @@ pollen.error.poll.voteCountingType.mandatory=vote counting type is mandatory pollen.error.poll.voteVisibility.mandatory=vote visibility is mandatory pollen.error.poll.voterList.mandatory.for.groupedPoll=At least one voter list ins mandatory for a grouped poll pollen.error.poll.voterList.mismatch.freePoll= +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.passwordEmpty=password can not be empty +pollen.error.user.passwordInvalid=password is not valid pollen.service.mail.ChoiceAddedEmail.subject=[Pollen] A choice was added in poll %s pollen.service.mail.ChoiceDeletedEmail.subject=[Pollen] A choice was deleted in poll %s pollen.service.mail.ChoiceEditedEmail.subject=[Pollen] A choice 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 572583b..2bc5315 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 @@ -27,6 +27,11 @@ pollen.error.poll.voteCountingType.mandatory=le type de vote est obligatoire pollen.error.poll.voteVisibility.mandatory=la visiblité des votes est obligatoire pollen.error.poll.voterList.mandatory.for.groupedPoll=Au moins une liste de votant est obligatoire pour un sondage groupé pollen.error.poll.voterList.mismatch.freePoll=Liste de votants impossible pour un sondage libre +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.passwordEmpty=Mot de passe ne peut pas être vide +pollen.error.user.passwordInvalid=Mot de passe est invalide pollen.service.mail.ChoiceAddedEmail.subject=[Pollen] Un choix a été ajouté au sondage %s pollen.service.mail.ChoiceDeletedEmail.subject=[Pollen] Un choix a été supprimé du sondage %s pollen.service.mail.ChoiceEditedEmail.subject=[Pollen] Un choix a été modifié sur le sondage %s diff --git a/pollen-ui-angular/src/main/webapp/partials/user-register.html b/pollen-ui-angular/src/main/webapp/partials/user-register.html index 3109875..819a4e5 100644 --- a/pollen-ui-angular/src/main/webapp/partials/user-register.html +++ b/pollen-ui-angular/src/main/webapp/partials/user-register.html @@ -62,6 +62,10 @@ <div class="col-sm-6"> <input type="password" id="formPassword" name="password" class="form-control" ng-model="data.user.password"/> </div> + <div class="col-sm-1"> + <info-error error="restError.password[0]" data="data.user.password"></info-error> + + </div> </div> <div class="control-group"> <label for="formPassword2" class="col-sm-5 text-right control-label"> -- To stop receiving notification emails like this one, please contact Chorem.org SCM administrator <admin+scm@chorem.org>.