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 09155938fa9ba73d15542c4b1500bdbc13aa9506 Author: Adrien Garandel <a.garandel@dralagen.fr> Date: Mon Jun 2 14:05:11 2014 +0200 translate choice error --- .../java/org/chorem/pollen/services/service/ChoiceService.java | 8 +++++--- .../src/main/resources/i18n/pollen-services_en_GB.properties | 3 +++ .../src/main/resources/i18n/pollen-services_fr_FR.properties | 3 +++ 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/service/ChoiceService.java b/pollen-services/src/main/java/org/chorem/pollen/services/service/ChoiceService.java index 2514e88..3e6acc0 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/service/ChoiceService.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/service/ChoiceService.java @@ -37,6 +37,8 @@ import org.chorem.pollen.services.service.security.PermissionVerb; import java.util.List; import java.util.Set; +import static org.nuiton.i18n.I18n.l; + /** * TODO * @@ -259,7 +261,7 @@ public class ChoiceService extends PollenServiceSupport { Set<String> choiceNames = Sets.newHashSet(); - boolean withChoiceType = checkNotNull(errors, "choiceType", choice.getChoiceType(), "choiceType can not be null"); + boolean withChoiceType = checkNotNull(errors, "choiceType", choice.getChoiceType(), l(getLocale(), "pollen.error.choice.choiceTypeEmpty")); if (CollectionUtils.isNotEmpty(existingChoices)) { @@ -289,11 +291,11 @@ public class ChoiceService extends PollenServiceSupport { boolean nameNotBlank = checkNotBlank(errors, "name", choiceName, - "choice name can not be empty"); + l(getLocale(), "pollen.error.choice.choiceNameEmpty")); if (nameNotBlank) { boolean nameAdded = choiceNames.add(choiceName); - check(errors, "name", nameAdded, "choice name already used in this list"); + check(errors, "name", nameAdded, l(getLocale(), "pollen.error.choice.choiceNameExist")); } break; 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 aba2f45..3eab430 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 @@ -11,6 +11,9 @@ pollen.configuration.defaultPollVoteVisibility=Default Poll vote visibility used pollen.configuration.defaultPollenUserPageSize= pollen.configuration.defaultVoteCountingType=Default vote counting type used when creating a new poll pollen.configuration.sessionTimeoutDelay=Inactivity delay before invalidate the session of a user (in seconds) +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.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 2bc5315..1faec5d 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 @@ -11,6 +11,9 @@ pollen.configuration.defaultPollVoteVisibility=Visibilité des votes par défaut pollen.configuration.defaultPollenUserPageSize= pollen.configuration.defaultVoteCountingType=Type de dépouillement par défaut lors de la création d'un nouveau sondage pollen.configuration.sessionTimeoutDelay=Temps autorisé d'inactivité avant d'invalider une session utilisateur (en secondes) +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.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>.