[pollen] branch develop updated (5d56b2d -> 515309f)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository pollen. See http://git.chorem.org/pollen.git from 5d56b2d translate voterlist error messages, add somme test for VoterListService new 515309f translate poll-info The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 515309f442241fb13b3f2ca250c3662caf1ff63f Author: Adrien Garandel <a.garandel@dralagen.fr> Date: Mon Aug 11 16:14:28 2014 +0200 translate poll-info Summary of changes: pollen-ui-angular/src/main/webapp/i18n/en.js | 11 +++++++++-- pollen-ui-angular/src/main/webapp/i18n/fr.js | 11 +++++++++-- pollen-ui-angular/src/main/webapp/partials/poll-info.html | 14 +++++++------- 3 files changed, 25 insertions(+), 11 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
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 515309f442241fb13b3f2ca250c3662caf1ff63f Author: Adrien Garandel <a.garandel@dralagen.fr> Date: Mon Aug 11 16:14:28 2014 +0200 translate poll-info --- pollen-ui-angular/src/main/webapp/i18n/en.js | 11 +++++++++-- pollen-ui-angular/src/main/webapp/i18n/fr.js | 11 +++++++++-- pollen-ui-angular/src/main/webapp/partials/poll-info.html | 14 +++++++------- 3 files changed, 25 insertions(+), 11 deletions(-) diff --git a/pollen-ui-angular/src/main/webapp/i18n/en.js b/pollen-ui-angular/src/main/webapp/i18n/en.js index 8b62746..78fd1e5 100644 --- a/pollen-ui-angular/src/main/webapp/i18n/en.js +++ b/pollen-ui-angular/src/main/webapp/i18n/en.js @@ -117,6 +117,13 @@ var translateEN = { 'poll.config.value.visibility.creator' : 'Creator', 'poll.config.value.visibility.anonymous' : 'Anonymous', 'poll.config.value.visibility.nobody' : 'Nobody', +'poll.info.beginVote' : 'Start of voting {{time}}', +'poll.info.endVote' : 'End of voting {{time}}', +'poll.info.noEndDate' : 'No End Date is fixed', +'poll.info.beginAddChoiceAllowed' : 'Start adding choice will be allowed {{time}}', +'poll.info.endAddChoiceAllowed' : 'End adding choice will be allowed {{time}}', +'poll.info.addChoiceAllowed.waring' : 'The period for adding choice and vote overlays', +'poll.info.addChoiceAllowed.waring.help' : 'Votes may can\'t be representative of reality', 'poll.info.vote.noViewChoice' : 'This choice does not exist in the vote', 'poll.error.noResource' : 'No resource has send', 'poll.error.listEmpty' : 'No poll find', @@ -162,9 +169,9 @@ var translateEN = { 'action.message.confirmDelete' : 'Are you sure to delete it?', 'action.message.confirmClose' : 'Are you sure to close it?', -'error.forbidden' : 'Access forbidden', +'error.forbidden' : 'Access forbidden' -} +}; // // Source i18n : https://github.com/angular/bower-angular-i18n/blob/v1.2.19-build.267%2Bsha.4... diff --git a/pollen-ui-angular/src/main/webapp/i18n/fr.js b/pollen-ui-angular/src/main/webapp/i18n/fr.js index baa980a..c6670dd 100644 --- a/pollen-ui-angular/src/main/webapp/i18n/fr.js +++ b/pollen-ui-angular/src/main/webapp/i18n/fr.js @@ -117,6 +117,13 @@ var translateFR = { 'poll.config.value.visibility.creator' : 'Créateur', 'poll.config.value.visibility.anonymous' : 'Anonyme', 'poll.config.value.visibility.nobody' : 'Personne', +'poll.info.beginVote' : 'Début des votes {{time}}', +'poll.info.endVote' : 'Fin des votes {{time}}', +'poll.info.noEndDate' : 'Aucune date de fin de vote fixé.', +'poll.info.beginAddChoiceAllowed' : 'Début d\'ajout de choix {{time}}', +'poll.info.endAddChoiceAllowed' : 'Fin d\'ajout de choix {{time}}', +'poll.info.addChoiceAllowed.waring' : 'La période d\'ajout de choix et de vote se superpose', +'poll.info.addChoiceAllowed.waring.help' : 'Les votes peuvent ne pas être représentatif de la réalité.', 'poll.info.vote.noViewChoice' : 'Ce choix n\'existait pas lors du vote', 'poll.error.noResource' : 'Aucune ressource a envoyer', 'poll.error.listEmpty' : 'Aucun sondage trouvé', @@ -162,9 +169,9 @@ var translateFR = { 'action.message.confirmDelete' : 'Êtes vous sûr de vouloir le supprimer?', 'action.message.confirmClose' : 'Êtes vous sûr de vouloir le fermer?', -'error.forbidden' : 'Accès interdit', +'error.forbidden' : 'Accès interdit' -} +}; // // Source i18n : https://github.com/angular/bower-angular-i18n/blob/v1.2.19-build.267%2Bsha.4... diff --git a/pollen-ui-angular/src/main/webapp/partials/poll-info.html b/pollen-ui-angular/src/main/webapp/partials/poll-info.html index f37ea54..377d2f0 100644 --- a/pollen-ui-angular/src/main/webapp/partials/poll-info.html +++ b/pollen-ui-angular/src/main/webapp/partials/poll-info.html @@ -1,33 +1,33 @@ <div ng-if="data.poll.beginDate >= now" class="anim"> - <h4>Début des votes : {{timeToBeginVote}} </h4> + <h4>{{ 'poll.info.beginVote' | translate:{'time':timeToBeginVote} }}</h4> </div> <div ng-if="data.poll.endDate && data.poll.beginDate < data.poll.endDate && timeToEndVote.value < 100" class="anim"> - <h4>Fin des votes : {{timeToEndVote.label}} </h4> + <h4>{{ 'poll.info.endVote' | translate:{'time':timeToEndVote.label} }}</h4> <div ng-if="timeToEndVote.value > 0" class="anim"> <progressbar max="100" value="timeToEndVote.value" type="{{timeToEndVote.type}}"></progressbar> </div> </div> <div ng-if="!data.poll.endDate" class="anim"> - <h4> Aucune date de fin de vote fixé. </h4> + <h4>{{ 'poll.info.noEndDate' | translate }}</h4> </div> <div ng-if="data.poll.choiceAddAllowed && data.poll.beginChoiceDate >= now" class="anim"> - <h4>Début d'ajout de choix : {{timeToBeginAddChoice}} </h4> + <h4>{{ 'poll.info.beginAddChoiceAllowed' | translate:{'time':timeToBeginAddChoice} }}</h4> </div> <div ng-if="data.poll.choiceAddAllowed && timeToAddChoice.value < 100" class="anim"> - <h4>Fin d'ajout de choix : {{timeToAddChoice.label}} </h4> + <h4>{{ 'poll.info.endAddChoiceAllowed' | translate:{'time':timeToAddChoice.label} }}</h4> <div ng-if="timeToAddChoice.value > 0" class="anim"> <progressbar max="100" value="timeToAddChoice.value" type="{{timeToAddChoice.type}}"></progressbar> </div> </div> <div ng-if="data.poll.choiceAddAllowed && (!data.poll.endChoiceDate || data.poll.endChoiceDate > data.poll.beginDate)" class="anim"> - <h4>La période d'ajout de choix et de vote se superpose</h4> + <h4>{{ 'poll.info.addChoiceAllowed.waring' | translate }}</h4> <p> - Les votes peuvent ne pas être représatif de la réalité. + {{ 'poll.info.addChoiceAllowed.waring.help' | translate }} </p> </div> \ No newline at end of file -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
participants (1)
-
chorem.org scm