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 81c9b1aee1425fc334217cdda53b4abebf6bdb48 Author: Adrien Garandel <a.garandel@dralagen.fr> Date: Wed Jun 18 16:20:18 2014 +0200 translate favoriteList --- .../pollen/services/service/FavoriteListService.java | 16 +++++++++------- .../main/resources/i18n/pollen-services_en_GB.properties | 7 +++++++ .../main/resources/i18n/pollen-services_fr_FR.properties | 13 ++++++++++--- pollen-ui-angular/src/main/webapp/i18n/en.js | 15 +++++++++------ pollen-ui-angular/src/main/webapp/i18n/fr.js | 9 +++++++-- .../src/main/webapp/partials/favoriteList-edit.html | 2 +- 6 files changed, 43 insertions(+), 19 deletions(-) diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/service/FavoriteListService.java b/pollen-services/src/main/java/org/chorem/pollen/services/service/FavoriteListService.java index 82bc433..0e3e8a6 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/service/FavoriteListService.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/service/FavoriteListService.java @@ -44,6 +44,8 @@ import java.io.File; import java.util.List; import java.util.Set; +import static org.nuiton.i18n.I18n.l; + /** * TODO * @@ -381,7 +383,7 @@ public class FavoriteListService extends PollenServiceSupport { String favoriteListName = favoriteList.getName(); - boolean nameNotBlank = checkNotBlank(errors, "name", favoriteListName, "name can not be empty"); + boolean nameNotBlank = checkNotBlank(errors, "name", favoriteListName, l(getLocale(), "pollen.error.favoriteList.name.empty")); boolean favoriteListExists = favoriteList.isPersisted(); @@ -409,7 +411,7 @@ public class FavoriteListService extends PollenServiceSupport { } boolean nameAdded = favoriteListNames.add(favoriteListName); - check(errors, "name", nameAdded, "name already used by another favorite list"); + check(errors, "name", nameAdded, l(getLocale(), "pollen.error.favoriteList.name.already.used")); } return errors; @@ -443,26 +445,26 @@ public class FavoriteListService extends PollenServiceSupport { } - boolean nameNotBlank = checkNotBlank(errors, "name", favoriteListMember.getName(), "member name can not be empty"); + boolean nameNotBlank = checkNotBlank(errors, "name", favoriteListMember.getName(), l(getLocale(), "pollen.error.favoriteListMember.name.empty")); if (nameNotBlank) { boolean added = memberNames.add(favoriteListMember.getName()); - check(errors, "name", added, "member name already used"); + check(errors, "name", added, l(getLocale(), "pollen.error.favoriteListMember.name.already.used")); } String memberEmail = getCleanMail(favoriteListMember.getEmail()); - boolean emailNotBlank = checkNotBlank(errors, "email", memberEmail, "member email can not be empty"); + boolean emailNotBlank = checkNotBlank(errors, "email", memberEmail, l(getLocale(), "pollen.error.favoriteListMember.email.empty")); if (emailNotBlank) { - boolean emailValid = checkValidEmail(errors, "email", memberEmail, "member email is not valid"); + boolean emailValid = checkValidEmail(errors, "email", memberEmail, l(getLocale(), "pollen.error.favoriteListMember.email.invalid")); if (emailValid) { boolean emailAdded = memberEmails.add(memberEmail); - check(errors, "email", emailAdded, "member email already used in this list"); + check(errors, "email", emailAdded, l(getLocale(), "pollen.error.favoriteListMember.email.already.used")); } 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 3eab430..24b79ec 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 @@ -20,6 +20,13 @@ pollen.error.favoriteList.import.csv.invalid.email= pollen.error.favoriteList.import.ldap.already.used.email= pollen.error.favoriteList.import.ldap.already.used.name= pollen.error.favoriteList.import.ldap.invalid.email= +pollen.error.favoriteList.name.already.used=name already used by another favorite list +pollen.error.favoriteList.name.empty=name can not be empty +pollen.error.favoriteListMember.email.already.used=member email already used in this list +pollen.error.favoriteListMember.email.empty=member email can not be empty +pollen.error.favoriteListMember.email.invalid=member email is not valid +pollen.error.favoriteListMember.name.already.used=member name already used +pollen.error.favoriteListMember.name.empty=member name can not be empty pollen.error.poll.choice.mandatory=At least a choice is mandatory pollen.error.poll.commentVisibility.mandatory=comment visiblity is mandatory pollen.error.poll.mismatch.freePoll=cant' have a voter list for a free poll 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 1faec5d..c7df00c 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,15 +11,22 @@ 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.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= pollen.error.favoriteList.import.ldap.already.used.email= pollen.error.favoriteList.import.ldap.already.used.name= pollen.error.favoriteList.import.ldap.invalid.email= +pollen.error.favoriteList.name.already.used=Le nom est déjà utilisé par une autre liste +pollen.error.favoriteList.name.empty=Le nom de la liste est obligatoire +pollen.error.favoriteListMember.email.already.used=Le courriel du membre est déjà utilisé dans cette liste +pollen.error.favoriteListMember.email.empty=Le courriel est obligatoire +pollen.error.favoriteListMember.email.invalid=Le courriel du membre est invalide +pollen.error.favoriteListMember.name.already.used=Le nom du membre est déjà utilisé dans cette liste +pollen.error.favoriteListMember.name.empty=Le nom du membre est obligatoire pollen.error.poll.choice.mandatory=Au moins un choix est nécessaire pollen.error.poll.commentVisibility.mandatory=la visibilité des commentaires est obligatoire pollen.error.poll.pollType.mandatory=le type de sondage est obligatoire diff --git a/pollen-ui-angular/src/main/webapp/i18n/en.js b/pollen-ui-angular/src/main/webapp/i18n/en.js index 00ee69b..f878922 100644 --- a/pollen-ui-angular/src/main/webapp/i18n/en.js +++ b/pollen-ui-angular/src/main/webapp/i18n/en.js @@ -28,6 +28,7 @@ var translateEN = { 'user.register.success' : 'Register with success', 'user.edit.success' : 'Save with success', 'user.forgotPassword.success' : 'Password send by email', +'user.favoriteList' : 'Favorite list', 'user.error.password.diff' : 'Passwords not equal', 'user.error.mail.notFound' : 'E-mail not found', 'user.error.mail.empty' : 'E-mail can not be empty', @@ -60,7 +61,6 @@ var translateEN = { 'comment' : 'Comment', 'comment.added' : 'Comment added.', - 'action.logout' : 'Logout', 'action.login' : 'Login', 'action.register' : 'Register', @@ -72,15 +72,18 @@ var translateEN = { 'action.delete' : 'Delete', 'action.vote' : 'Vote', 'action.comment' : 'Comment', -'action.restricted.addVoter' : 'Add Voter', -'action.restricted.deleteVoter' : 'Delete Voter', -'action.restricted.addGroup' : 'Add Group', -'action.restricted.deleteGroup' : 'Delete Group', +'action.restricted.addVoter' : 'Add a Voter', +'action.restricted.deleteVoter' : 'Delete the Voter', +'action.restricted.addGroup' : 'Add a Group', +'action.restricted.deleteGroup' : 'Delete the Group', 'action.restricted.notify' : 'Notify', +'action.favoriteList.add' : 'Add favorite list', +'action.favoriteList.delete' : 'Delete the favorite list', +'action.favoriteList.addMember' : 'Add a member', +'action.favoriteList.deleteMember' : 'Delete the member', 'action.message.confirmDelete' : 'Are you sure to delete it?', - 'dateFormat' : 'MM-dd-yy', } diff --git a/pollen-ui-angular/src/main/webapp/i18n/fr.js b/pollen-ui-angular/src/main/webapp/i18n/fr.js index 78f9297..f710b33 100644 --- a/pollen-ui-angular/src/main/webapp/i18n/fr.js +++ b/pollen-ui-angular/src/main/webapp/i18n/fr.js @@ -28,6 +28,7 @@ var translateFR = { 'user.register.success' : 'Compte enregisté, un mail de validation vient d\'être envoyé..', 'user.edit.success' : 'Modification effectuée..', 'user.forgotPassword.success' : 'Un mail de changement de mot de passe vient d\'être envoyé..', +'user.favoriteList' : 'Liste de Diffusion Favorite', 'user.error.password.diff' : 'Mot de passe différent', 'user.error.mail.notFound' : 'Courriel n\'a pas été trouvé', 'user.error.mail.empty' : 'Courriel ne peux pas être vide', @@ -72,10 +73,14 @@ var translateFR = { 'action.vote' : 'Voter', 'action.comment' : 'Commenter', 'action.restricted.addVoter' : 'Ajouter un Votant', -'action.restricted.deleteVoter' : 'Supprimer un Votant', +'action.restricted.deleteVoter' : 'Supprimer le Votant', 'action.restricted.addGroup' : 'Ajouter un Groupe de Votant', -'action.restricted.deleteGroup' : 'Supprimer un Groupe de Votant', +'action.restricted.deleteGroup' : 'Supprimer le Groupe de Votant', 'action.restricted.notify' : 'Envoyer un mail', +'action.favoriteList.add' : 'Ajouter une liste de diffusion', +'action.favoriteList.delete' : 'Supprimer la liste de diffusion', +'action.favoriteList.addMember' : 'Ajouter un membre', +'action.favoriteList.deleteMember' : 'Supprimer le membre', 'action.message.confirmDelete' : 'Êtes vous sûr de vouloir le supprimer?', diff --git a/pollen-ui-angular/src/main/webapp/partials/favoriteList-edit.html b/pollen-ui-angular/src/main/webapp/partials/favoriteList-edit.html index 02aa7d0..734ccdc 100644 --- a/pollen-ui-angular/src/main/webapp/partials/favoriteList-edit.html +++ b/pollen-ui-angular/src/main/webapp/partials/favoriteList-edit.html @@ -28,7 +28,7 @@ <td ng-class="{'has-error':member.restError.email}"> <input type="text" ng-model="member.email" class="form-control" auto-save="saveMember(member)" tooltip="{{member.restError.email[0]}}" /> </td> - <td class="action"> <div ng-show="member.id"><button class="btn btn-danger" ng-click="deleteMember(member);"><span class="glyphicon glyphicon-remove"></span></button></div></td> + <td class="action"> <div ng-show="member.id"><button class="btn btn-danger" ng-click="deleteMember(member);" tooltip="{{ 'action.favoriteList.deleteMember' | translate }} "><span class="glyphicon glyphicon-remove"></span></button></div></td> </tr> <tr> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.