Author: fdesbois Date: 2012-04-16 13:26:38 +0200 (Mon, 16 Apr 2012) New Revision: 3276 Url: http://chorem.org/repositories/revision/pollen/3276 Log: fixes #511 : email validation + add missing translations Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/SavePoll.java trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_en_GB.properties trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_fr_FR.properties trunk/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/admin/ManageUsers-create-validation.xml trunk/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/admin/ManageUsers-edit-validation.xml trunk/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/user/Edit-validation.xml trunk/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/user/ManageFavoriteList-addPollAccount-validation.xml trunk/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/user/ManageFavoriteList-editPollAccount-validation.xml trunk/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/user/Register-validation.xml Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/SavePoll.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/SavePoll.java 2012-04-16 11:26:30 UTC (rev 3275) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/SavePoll.java 2012-04-16 11:26:38 UTC (rev 3276) @@ -430,6 +430,13 @@ } } + String creatorEmail = poll.getCreator().getEmail(); + if (creatorEmail != null && !StringUtil.isEmail(creatorEmail)) { + + addOptionsError("poll.creator.email", + _("pollen.error.email.invalid")); + } + if (validateEndDate(poll.getBeginChoiceDate(), poll.getEndChoiceDate())) { addOptionsError("poll.endChoiceDate", @@ -558,7 +565,7 @@ if (StringUtils.isEmpty(email)) { addOptionsError( fieldNamePrefix, - _("pollen.error.poll.personToList.email.required")); + _("pollen.error.email.required")); } else { @@ -568,7 +575,7 @@ // not a valid email addOptionsError( fieldNamePrefix, - _("pollen.error.poll.personToList.email.not.valid")); + _("pollen.error.email.invalid")); } else { // check email not doublon Modified: trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_en_GB.properties =================================================================== --- trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_en_GB.properties 2012-04-16 11:26:30 UTC (rev 3275) +++ trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_en_GB.properties 2012-04-16 11:26:38 UTC (rev 3276) @@ -125,6 +125,7 @@ pollen.error.choice.empty=%s mandatory pollen.error.comment.name.empty=Comment name mandatory pollen.error.comment.text.empty=Comment text mandatory +pollen.error.email.invalid=The email doesn't have the good format pollen.error.email.required=You must provide an email pollen.error.favoriteList.already.used=List name already used pollen.error.favoriteList.not.found=Favorite list not found @@ -133,7 +134,7 @@ pollen.error.favoriteList.participant.not.found.in.list=Member not found in favorite list pollen.error.favoriteListName.required=List name mandatory pollen.error.login.required=You must provide a login -pollen.error.lostPassword.email=The provided e-mail is not valid. +pollen.error.lostPassword.email=The provided e-mail is not valid pollen.error.lostPassword.user=No user matches the given e-mail pollen.error.no.poll.found=Poll not found with id %s pollen.error.password.required=Your must provide a password @@ -144,18 +145,15 @@ pollen.error.poll.endChoiceDate.before.beginChoiceDate=The choice end date must be later than the begin date. pollen.error.poll.endDate.before.beginDate=The poll end date must be later than the begin date. pollen.error.poll.notfound=No such poll exists. Please make sure that you are using the correct link and copy it completely into your browser's address field. -pollen.error.poll.personToList.email.doublon= -pollen.error.poll.personToList.email.not.valid= -pollen.error.poll.personToList.email.required= -pollen.error.poll.personToList.votingId.doublon= -pollen.error.poll.personToList.weight.not.valid= -pollen.error.poll.required.one.choice=You must provide at least one choice. -pollen.error.poll.required.one.personToList= +pollen.error.poll.personToList.email.doublon=Email must be unique +pollen.error.poll.personToList.votingId.doublon=The voter's name must be unique +pollen.error.poll.personToList.weight.not.valid=The voter's weight is not valid (must be greater than 0) +pollen.error.poll.required.one.choice=You must provide at least one choice +pollen.error.poll.required.one.personToList=You must provide at least one voter pollen.error.poll.required.title=You must provide a title for the poll -pollen.error.poll.required.votingList.name= -pollen.error.poll.votingList.name.doublon= -pollen.error.poll.votingList.weight.not.valid= -pollen.error.pollAccount.email.required=Em@il mandatory +pollen.error.poll.required.votingList.name=The group's name is mandatory +pollen.error.poll.votingList.name.doublon=The group's name must be unique +pollen.error.poll.votingList.weight.not.valid=The group's weight is not valid (must be greater than 0) pollen.error.pollAccount.not.found=Poll account not found pollen.error.pollAccount.votingId.required=Name mandatory pollen.error.pollNotClosed=The poll is not closed. Results may change. @@ -237,6 +235,8 @@ pollen.menu.preferences=My account pollen.menu.register=Register pollen.menu.userFavoriteLists=Voting lists +pollen.tab.poll.general=Informations +pollen.tab.poll.options=Options pollen.title.clone.poll=Clone a poll pollen.title.close.poll=Close a poll pollen.title.createPoll=New poll Modified: trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_fr_FR.properties =================================================================== --- trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_fr_FR.properties 2012-04-16 11:26:30 UTC (rev 3275) +++ trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_fr_FR.properties 2012-04-16 11:26:38 UTC (rev 3276) @@ -132,7 +132,8 @@ pollen.error.choice.empty=%s obligatoire pollen.error.comment.name.empty=Nom du commentaire obligatoire pollen.error.comment.text.empty=Texte du commentaire obligatoire -pollen.error.email.required=Courriel obligatoire +pollen.error.email.invalid=Email non valide +pollen.error.email.required=Email obligatoire pollen.error.favoriteList.already.used=Nom de liste déjà utilisé pollen.error.favoriteList.not.found=Liste non trouvée pollen.error.favoriteList.not.owned.by.user=La liste d'utilisateur ne vous appartient pas @@ -152,8 +153,6 @@ pollen.error.poll.endDate.before.beginDate=La date de fin du sondage doit-être postérieure à la date de début. pollen.error.poll.notfound=Il n'y a pas de sondage à cette adresse. Veuillez verifier que vous utilisez le lien correcte et copiez-le complètement dans le champ d'adresse de votre navigateur. pollen.error.poll.personToList.email.doublon=Les emails doivent être uniques. -pollen.error.poll.personToList.email.not.valid=Email non valide -pollen.error.poll.personToList.email.required=Email obligatoire pollen.error.poll.personToList.votingId.doublon=Les noms des votants doivent être uniques. pollen.error.poll.personToList.weight.not.valid=Poids du votant non valide (doit être une nombre supérieur à 0). pollen.error.poll.required.one.choice=Vous devez saisir au moins un choix. @@ -162,7 +161,6 @@ pollen.error.poll.required.votingList.name=nom du groupe non renseigné pollen.error.poll.votingList.name.doublon=Les noms de groupes doivent être uniques. pollen.error.poll.votingList.weight.not.valid=Poids du groupe votant non valide (doit être une nombre supérieur à 0). -pollen.error.pollAccount.email.required=Em@il obliqatoire pollen.error.pollAccount.not.found=Membre non trouvé pollen.error.pollAccount.votingId.required=Nom obliqatoire pollen.error.pollNotClosed=Ce sondage n'est pas clos. Les résultats peuvent encore changer. Modified: trunk/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/admin/ManageUsers-create-validation.xml =================================================================== --- trunk/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/admin/ManageUsers-create-validation.xml 2012-04-16 11:26:30 UTC (rev 3275) +++ trunk/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/admin/ManageUsers-create-validation.xml 2012-04-16 11:26:38 UTC (rev 3276) @@ -39,6 +39,10 @@ <message key="pollen.error.email.required"/> </field-validator> + <field-validator type="email"> + <message key="pollen.error.email.invalid"/> + </field-validator> + </field> </validators> Modified: trunk/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/admin/ManageUsers-edit-validation.xml =================================================================== --- trunk/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/admin/ManageUsers-edit-validation.xml 2012-04-16 11:26:30 UTC (rev 3275) +++ trunk/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/admin/ManageUsers-edit-validation.xml 2012-04-16 11:26:38 UTC (rev 3276) @@ -39,6 +39,10 @@ <message key="pollen.error.email.required"/> </field-validator> + <field-validator type="email"> + <message key="pollen.error.email.invalid"/> + </field-validator> + </field> </validators> Modified: trunk/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/user/Edit-validation.xml =================================================================== --- trunk/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/user/Edit-validation.xml 2012-04-16 11:26:30 UTC (rev 3275) +++ trunk/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/user/Edit-validation.xml 2012-04-16 11:26:38 UTC (rev 3276) @@ -55,6 +55,10 @@ <message key="pollen.error.email.required"/> </field-validator> + <field-validator type="email"> + <message key="pollen.error.email.invalid"/> + </field-validator> + </field> </validators> Modified: trunk/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/user/ManageFavoriteList-addPollAccount-validation.xml =================================================================== --- trunk/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/user/ManageFavoriteList-addPollAccount-validation.xml 2012-04-16 11:26:30 UTC (rev 3275) +++ trunk/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/user/ManageFavoriteList-addPollAccount-validation.xml 2012-04-16 11:26:38 UTC (rev 3276) @@ -40,9 +40,13 @@ <field name="createPollAccount.email"> <field-validator type="requiredstring"> - <message key="pollen.error.pollAccount.email.required"/> + <message key="pollen.error.email.required"/> </field-validator> + <field-validator type="email"> + <message key="pollen.error.email.invalid"/> + </field-validator> + </field> </validators> \ No newline at end of file Modified: trunk/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/user/ManageFavoriteList-editPollAccount-validation.xml =================================================================== --- trunk/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/user/ManageFavoriteList-editPollAccount-validation.xml 2012-04-16 11:26:30 UTC (rev 3275) +++ trunk/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/user/ManageFavoriteList-editPollAccount-validation.xml 2012-04-16 11:26:38 UTC (rev 3276) @@ -43,6 +43,10 @@ <message key="pollen.error.pollAccount.email.required"/> </field-validator> + <field-validator type="email"> + <message key="pollen.error.email.invalid"/> + </field-validator> + </field> </validators> \ No newline at end of file Modified: trunk/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/user/Register-validation.xml =================================================================== --- trunk/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/user/Register-validation.xml 2012-04-16 11:26:30 UTC (rev 3275) +++ trunk/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/user/Register-validation.xml 2012-04-16 11:26:38 UTC (rev 3276) @@ -59,6 +59,10 @@ <message key="pollen.error.email.required"/> </field-validator> + <field-validator type="email"> + <message key="pollen.error.email.invalid"/> + </field-validator> + </field> </validators>