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 a1a6b595fcd2cc5ce459f858c46899d1907a7a96 Author: Kevin Morin <morin@codelutin.com> Date: Fri Oct 17 17:13:10 2014 +0200 fixes #1114 poll edit : translate the popup to add or edit a choice --- pollen-ui-angular/src/main/webapp/i18n/en.js | 11 ++++++++++ pollen-ui-angular/src/main/webapp/i18n/fr.js | 11 ++++++++++ .../src/main/webapp/js/controllers/pollCtrl.js | 4 ++-- .../src/main/webapp/partials/poll-popupChoice.html | 24 +++++++++++----------- 4 files changed, 36 insertions(+), 14 deletions(-) diff --git a/pollen-ui-angular/src/main/webapp/i18n/en.js b/pollen-ui-angular/src/main/webapp/i18n/en.js index 818a62c..c7bedcb 100644 --- a/pollen-ui-angular/src/main/webapp/i18n/en.js +++ b/pollen-ui-angular/src/main/webapp/i18n/en.js @@ -92,6 +92,17 @@ var translateEN = { 'poll.tab.conf' : 'Configuration', 'poll.tab.participant' : 'Participants', +'poll.popupChoice.title.add' : 'Add a choice', +'poll.popupChoice.title.edit' : 'Édition du choix', +'poll.popupChoice.choiceType.label' : 'Choice type:', +'poll.popupChoice.text.label' : 'Text', +'poll.popupChoice.date.label' : 'Date', +'poll.popupChoice.resource.label' : 'Resource', +'poll.popupChoice.text.value' : 'Label:', +'poll.popupChoice.date.value' : 'Date:', +'poll.popupChoice.resource.value' : 'Resource:', +'poll.popupChoice.description.label' : 'Description:', + 'poll.link.toMaxify' : 'Maxify sidebar', 'poll.link.toMinify' : 'Minify sidebar', 'poll.link.edit' : 'Edit poll', diff --git a/pollen-ui-angular/src/main/webapp/i18n/fr.js b/pollen-ui-angular/src/main/webapp/i18n/fr.js index 2d17b93..b73fbe9 100644 --- a/pollen-ui-angular/src/main/webapp/i18n/fr.js +++ b/pollen-ui-angular/src/main/webapp/i18n/fr.js @@ -92,6 +92,17 @@ var translateFR = { 'poll.tab.conf' : 'Configuration', 'poll.tab.participant' : 'Participants', +'poll.popupChoice.title.add' : 'Ajout d\'un choix', +'poll.popupChoice.title.edit' : 'Édition du choix', +'poll.popupChoice.choiceType.label' : 'Type de choix :', +'poll.popupChoice.text.label' : 'Texte', +'poll.popupChoice.date.label' : 'Date', +'poll.popupChoice.resource.label' : 'Resource', +'poll.popupChoice.text.value' : 'Libellé :', +'poll.popupChoice.date.value' : 'Date :', +'poll.popupChoice.resource.value' : 'Resource :', +'poll.popupChoice.description.label' : 'Description :', + 'poll.link.toMaxify' : 'Agrandir le cadre', 'poll.link.toMinify' : 'Réduire le cadre', 'poll.link.edit' : 'Lien d\'édition', diff --git a/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js b/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js index 7c2d75e..97853e8 100644 --- a/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js +++ b/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js @@ -449,11 +449,11 @@ angular.module('pollControllers', ['ngRoute', 'pollenServices', 'pascalprecht.tr if (angular.isDefined($scope.restError)) { delete $scope.restError.choice; } - popupChoice(choice, 'Ajout d\'un Choix'); + popupChoice(choice, 'poll.popupChoice.title.add'); }; $scope.editChoice = function (choice, e) { - popupChoice(choice, 'Edition du Choix'); + popupChoice(choice, 'poll.popupChoice.title.edit'); if (e) { e.stopPropagation(); e.preventDefault(); diff --git a/pollen-ui-angular/src/main/webapp/partials/poll-popupChoice.html b/pollen-ui-angular/src/main/webapp/partials/poll-popupChoice.html index 84e0111..0b67ab0 100644 --- a/pollen-ui-angular/src/main/webapp/partials/poll-popupChoice.html +++ b/pollen-ui-angular/src/main/webapp/partials/poll-popupChoice.html @@ -21,22 +21,22 @@ <form class="form-horizontal"> <div class="modal-header"> - <h4 class="modal-title">{{title}}</h4> + <h4 class="modal-title">{{ title | translate }}</h4> </div> <div class="modal-body"> <div class="form-group"> - <label class="col-sm-4 control-label">Type de choix :</label> + <label class="col-sm-4 control-label">{{ 'poll.popupChoice.choiceType.label' | translate }}</label> <div class="col-sm-8 btn-group"> - <button type="button" class="btn btn-default" ng-model="choice.choiceType" btn-radio="'TEXT'">Text</button> - <button type="button" class="btn btn-default" ng-model="choice.choiceType" btn-radio="'DATE'">Date</button> - <button type="button" class="btn btn-default" ng-model="choice.choiceType" btn-radio="'RESOURCE'">Resource</button> + <button type="button" class="btn btn-default" ng-model="choice.choiceType" btn-radio="'TEXT'">{{ 'poll.popupChoice.text.label' | translate }}</button> + <button type="button" class="btn btn-default" ng-model="choice.choiceType" btn-radio="'DATE'">{{ 'poll.popupChoice.date.label' | translate }}</button> + <button type="button" class="btn btn-default" ng-model="choice.choiceType" btn-radio="'RESOURCE'">{{ 'poll.popupChoice.resource.label' | translate }}</button> </div> </div> <div class="form-group" ng-if="choice.choiceType == 'TEXT'"> - <label for="popChoiceText" class="col-sm-4 control-label">Nom du Choix : </label> + <label for="popChoiceText" class="col-sm-4 control-label">{{ 'poll.popupChoice.text.value' | translate }}</label> <div class="col-sm-6"> <input id="popChoiceText" type="text" ng-model="choice.choiceValueText" class="form-control" focus-me="choice.choiceType == 'TEXT'"/> @@ -44,7 +44,7 @@ </div> <div class="form-group" ng-if="choice.choiceType == 'DATE'"> - <label class="col-sm-4 control-label">Date : </label> + <label class="col-sm-4 control-label">{{ 'poll.popupChoice.date.value' | translate }}</label> <div class="col-sm-6"> <datetimepicker ng-model="choice.choiceValueDate" focus="choice.choiceType == 'DATE'" ></datetimepicker> @@ -52,7 +52,7 @@ </div> <div class="form-group" ng-if="choice.choiceType == 'RESOURCE'"> - <label class="col-sm-4 control-label">Resource : </label> + <label class="col-sm-4 control-label">{{ 'poll.popupChoice.resource.value' | translate }}</label> <div class="col-sm-6"> <upload-file ng-model="choice.choiceValueImage"></upload-file> @@ -61,7 +61,7 @@ </div> <div class="form-group"> - <label for="popDescChoice" class="col-sm-4 control-label">Description : </label> + <label for="popDescChoice" class="col-sm-4 control-label">{{ 'poll.popupChoice.description.label' | translate }}</label> <div class="col-sm-6"> <textarea id="popDescChoice" type="text" ng-model="choice.description" class="form-control"></textarea> @@ -69,9 +69,9 @@ </div> </div> <div class="modal-footer"> - <button type="button" class="btn btn-danger" ng-if="choice.choiceIsDeletable" ng-click="deleteChoice(choice)"><span class="fa fa-trash"></span> Supprimer</button> - <button type="button" class="btn btn-default" ng-click="cancelChoice()"><span class="fa fa-remove"></span> Annuler</button> - <button type="button" class="btn btn-primary" ng-click="saveChoice()"><span class="fa fa-save"></span> Sauvegarder</button> + <button type="button" class="btn btn-danger" ng-if="choice.choiceIsDeletable" ng-click="deleteChoice(choice)"><span class="fa fa-trash"></span> {{ 'action.delete' | translate }}</button> + <button type="button" class="btn btn-default" ng-click="cancelChoice()"><span class="fa fa-remove"></span> {{ 'action.cancel' | translate }}</button> + <button type="button" class="btn btn-primary" ng-click="saveChoice()"><span class="fa fa-save"></span> {{ 'action.save' | translate }}</button> <!--<button type="button" class="btn btn-success" ng-click="saveChoice()"><span class="fa fa-save"></span> Sauvegarder</button>--> <!--<button type="button" class="btn btn-primary" ng-click="saveChoiceAndContinue()"><span class="fa fa-save"></span> Sauvegarder et nouveau</button>--> </div> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.