branch develop updated (06185bc0 -> 3d2d2a53)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git from 06185bc0 Ajout d'un TODO : Ne pas générer les preview à chaque appel new 3d2d2a53 Singularisation de termes 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 3d2d2a53b35b09cc565ea05e595ed958b4c6aa53 Author: Arnaud Thimel <thimel@codelutin.com> Date: Wed Jan 3 15:02:40 2018 +0100 Singularisation de termes Summary of changes: pollen-ui-riot-js/src/main/web/i18n/en.json | 12 ++++++------ pollen-ui-riot-js/src/main/web/i18n/fr.json | 10 +++++----- pollen-ui-riot-js/src/main/web/tag/poll/Results.tag.html | 2 +- .../main/web/tag/voteCountingType/BordaDetailResult.tag.html | 2 +- .../web/tag/voteCountingType/CoombsDetailResult.tag.html | 2 +- 5 files changed, 14 insertions(+), 14 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 https://gitlab.nuiton.org/chorem/pollen.git commit 3d2d2a53b35b09cc565ea05e595ed958b4c6aa53 Author: Arnaud Thimel <thimel@codelutin.com> Date: Wed Jan 3 15:02:40 2018 +0100 Singularisation de termes --- pollen-ui-riot-js/src/main/web/i18n/en.json | 12 ++++++------ pollen-ui-riot-js/src/main/web/i18n/fr.json | 10 +++++----- pollen-ui-riot-js/src/main/web/tag/poll/Results.tag.html | 2 +- .../main/web/tag/voteCountingType/BordaDetailResult.tag.html | 2 +- .../web/tag/voteCountingType/CoombsDetailResult.tag.html | 2 +- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/pollen-ui-riot-js/src/main/web/i18n/en.json b/pollen-ui-riot-js/src/main/web/i18n/en.json index 5f26cd03..f01540d8 100644 --- a/pollen-ui-riot-js/src/main/web/i18n/en.json +++ b/pollen-ui-riot-js/src/main/web/i18n/en.json @@ -75,9 +75,9 @@ "poll_print": "Print the page", "poll_results_title": "Results", "poll_results_noResult": "Results are not yet available.", - "poll_results_ranks": "Ranks", - "poll_results_choices": "Choices", - "poll_results_results": "Results", + "poll_results_rank": "Rank", + "poll_results_choices": "Choice", + "poll_results_results": "Result", "poll_results_unit_1_one": "vote", "poll_results_unit_1_many": "votes", "poll_results_unit_2_one": "point", @@ -93,7 +93,7 @@ "poll_results_unit_7_one": "vote", "poll_results_unit_7_many": "votes", "poll_results_borda_title": "Score table", - "poll_results_borda_ranks": "Ranks", + "poll_results_borda_rank": "Rank", "poll_results_borda_points": "Points", "poll_results_borda_total": "Total", "poll_results_condorcet_title": "Battle table", @@ -101,7 +101,7 @@ "poll_results_instantRunoff_title": "Eliminations table", "poll_results_instantRunoff_rounds": "Rounds", "poll_results_coombs_title": "Eliminations table", - "poll_results_coombs_rounds": "Rounds", + "poll_results_coombs_round": "Round", "poll_results_coombs_ranks": "Ranks", "poll_results_coombs_firstRank": "First", "poll_results_coombs_lastRank": "Last", @@ -137,7 +137,7 @@ "poll_votes_addChoice": "Add choice", "poll_votes_choices": "Choices", "poll_votes_delete": "Delete vote?", - "poll_votes_results": "Results", + "poll_votes_results": "Result", "poll_votes_noVote": "No vote", "poll_votes_results_unit_1_one": "vote", "poll_votes_results_unit_1_many": "votes", diff --git a/pollen-ui-riot-js/src/main/web/i18n/fr.json b/pollen-ui-riot-js/src/main/web/i18n/fr.json index b6fffcce..9c6345cf 100644 --- a/pollen-ui-riot-js/src/main/web/i18n/fr.json +++ b/pollen-ui-riot-js/src/main/web/i18n/fr.json @@ -75,9 +75,9 @@ "poll_print": "Imprimer la page", "poll_results_title": "Résultats", "poll_results_noResult": "Les résultats ne sont pas encore disponibles.", - "poll_results_ranks": "Rangs", + "poll_results_rank": "Rang", "poll_results_choices": "Choix", - "poll_results_results": "Résultats", + "poll_results_results": "Résultat", "poll_results_unit_1_one": "vote", "poll_results_unit_1_many": "votes", "poll_results_unit_2_one": "point", @@ -93,7 +93,7 @@ "poll_results_unit_7_one": "vote", "poll_results_unit_7_many": "votes", "poll_results_borda_title": "Tableau des points", - "poll_results_borda_ranks": "Rangs", + "poll_results_borda_rank": "Rang", "poll_results_borda_points": "Points", "poll_results_borda_total": "Totaux", "poll_results_condorcet_title": "Tableau des combats", @@ -101,7 +101,7 @@ "poll_results_instantRunoff_title": "Tableau des éliminations", "poll_results_instantRunoff_rounds": "Tours", "poll_results_coombs_title": "Tableau des éliminations", - "poll_results_coombs_rounds": "Tours", + "poll_results_coombs_round": "Tour", "poll_results_coombs_ranks": "Rangs", "poll_results_coombs_firstRank": "1er", "poll_results_coombs_lastRank": "Der.", @@ -137,7 +137,7 @@ "poll_votes_addChoice": "Ajouter un choix", "poll_votes_choices": "Choix", "poll_votes_delete": "Supprimer le vote ?", - "poll_votes_results": "Résultats", + "poll_votes_results": "Résultat", "poll_votes_noVote": "Aucun vote", "poll_votes_results_unit_1_one": "vote", "poll_votes_results_unit_1_many": "votes", diff --git a/pollen-ui-riot-js/src/main/web/tag/poll/Results.tag.html b/pollen-ui-riot-js/src/main/web/tag/poll/Results.tag.html index ddf2b46e..56b1614a 100644 --- a/pollen-ui-riot-js/src/main/web/tag/poll/Results.tag.html +++ b/pollen-ui-riot-js/src/main/web/tag/poll/Results.tag.html @@ -34,7 +34,7 @@ require("../voteCountingType/MajorityJudgmentDetailResult.tag.html"); <table class="table-results"> <thead> <tr> - <th>{__.ranks}</th> + <th>{__.rank}</th> <th>{__.results}</th> <th>{__.choices}</th> </tr> diff --git a/pollen-ui-riot-js/src/main/web/tag/voteCountingType/BordaDetailResult.tag.html b/pollen-ui-riot-js/src/main/web/tag/voteCountingType/BordaDetailResult.tag.html index a5b25608..780b6aa0 100644 --- a/pollen-ui-riot-js/src/main/web/tag/voteCountingType/BordaDetailResult.tag.html +++ b/pollen-ui-riot-js/src/main/web/tag/voteCountingType/BordaDetailResult.tag.html @@ -24,7 +24,7 @@ require("../poll/ChoiceView.tag.html"); <table class="ranks"> <tr> - <td class="cell">{__.ranks}</td> + <td class="cell">{__.rank}</td> <td class="cell rank" each={rank in Array.from(Array(poll.voteCountingConfig.maxChoiceNumber || poll.choices.length).keys())}> {rank + 1} </td> diff --git a/pollen-ui-riot-js/src/main/web/tag/voteCountingType/CoombsDetailResult.tag.html b/pollen-ui-riot-js/src/main/web/tag/voteCountingType/CoombsDetailResult.tag.html index 438f5ec1..6226b140 100644 --- a/pollen-ui-riot-js/src/main/web/tag/voteCountingType/CoombsDetailResult.tag.html +++ b/pollen-ui-riot-js/src/main/web/tag/voteCountingType/CoombsDetailResult.tag.html @@ -23,7 +23,7 @@ require("../poll/ChoiceView.tag.html"); <h3 class="c-heading">{__.title}</h3> <table class="rounds"> <tr> - <td class="cell">{__.rounds}</td> + <td class="cell">{__.round}</td> <td class="cell" each={round, index in (poll.results && poll.results.detail && poll.results.detail.rounds || [])}> {index + 1} </td> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
participants (1)
-
chorem.org scm