This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository pollen. See http://git.chorem.org/pollen.git commit a8446d8f171ade6292b8dcba9da502e33e219287 Author: Adrien Garandel <a.garandel@dralagen.fr> Date: Mon Aug 11 14:26:30 2014 +0200 translate comment error message --- .../java/org/chorem/pollen/services/service/CommentService.java | 6 ++++-- .../src/main/resources/i18n/pollen-services_en_GB.properties | 2 ++ .../src/main/resources/i18n/pollen-services_fr_FR.properties | 2 ++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/service/CommentService.java b/pollen-services/src/main/java/org/chorem/pollen/services/service/CommentService.java index c9437d2..ae57670 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/service/CommentService.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/service/CommentService.java @@ -37,6 +37,8 @@ import org.chorem.pollen.services.service.security.SecurityService; import org.nuiton.util.pagination.PaginationParameter; import org.nuiton.util.pagination.PaginationResult; +import static org.nuiton.i18n.I18n.l; + /** * TODO * @@ -162,8 +164,8 @@ public class CommentService extends PollenServiceSupport { ErrorMap errors = new ErrorMap(); - checkNotBlank(errors, "text", comment.getText(), "textcan not be empty"); - checkNotBlank(errors, "author.name", comment.getAuthorName(), "author name can not be empty"); + checkNotBlank(errors, "text", comment.getText(), l(getLocale(), "pollen.error.comment.text.mandatory")); + checkNotBlank(errors, "author.name", comment.getAuthorName(), l(getLocale(), "pollen.error.comment.author.name.mandatory")); return errors; 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 6c772c0..72a447f 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 @@ -16,6 +16,8 @@ pollen.error.choice.choiceDateExist=choice date already used in this list pollen.error.choice.choiceNameEmpty=choice name can not be empty pollen.error.choice.choiceNameExist=choice name already used in this list pollen.error.choice.choiceTypeEmpty=choiceType can not be null +pollen.error.comment.author.name.mandatory=author name can not be empty +pollen.error.comment.text.mandatory=text can not be empty pollen.error.favoriteList.import.csv.already.used.email= pollen.error.favoriteList.import.csv.already.used.name= pollen.error.favoriteList.import.csv.invalid.email= 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 bd143c7..244987a 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 @@ -16,6 +16,8 @@ pollen.error.choice.choiceDateExist=La date exist déjà utilisé sur ce sondage pollen.error.choice.choiceNameEmpty=Le nom du choix ne peut pas être vide pollen.error.choice.choiceNameExist=Le nom du choix est déjà utilisé sur ce sondage pollen.error.choice.choiceTypeEmpty=Le type du choix doit être défini +pollen.error.comment.author.name.mandatory=Le nom est obligatoire +pollen.error.comment.text.mandatory=le text est obligatoire pollen.error.favoriteList.import.csv.already.used.email= pollen.error.favoriteList.import.csv.already.used.name= pollen.error.favoriteList.import.csv.invalid.email= -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.