This is an automated email from the git hooks/post-receive script. New commit to branch feature/183-resultScore in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git commit 5e46d930d13a9a20a3aff4f9b5edf16d49512968 Author: Jean Couteau <jean.couteau@gmail.com> Date: Tue Apr 24 21:29:51 2018 +0200 fixes #183 : Les colonnes "Résultats" devraient s'intituler "Score" en Borda, nombre et cumulatif - Pour nombre on utilise Total --- pollen-ui-riot-js/src/main/web/i18n/en.json | 4 ++++ pollen-ui-riot-js/src/main/web/i18n/fr.json | 4 ++++ pollen-ui-riot-js/src/main/web/tag/poll/EditVote.tag.html | 4 +++- pollen-ui-riot-js/src/main/web/tag/poll/Results.tag.html | 4 +++- 4 files changed, 14 insertions(+), 2 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 26e7cc6f..a6d87a58 100644 --- a/pollen-ui-riot-js/src/main/web/i18n/en.json +++ b/pollen-ui-riot-js/src/main/web/i18n/en.json @@ -78,6 +78,8 @@ "poll_results_rank": "Rank", "poll_results_choices": "Choice", "poll_results_results": "Result", + "poll_results_scores": "Score", + "poll_results_totals": "Total", "poll_results_eliminated": "Eliminated", "poll_results_unit_1_one": "vote", "poll_results_unit_1_many": "votes", @@ -139,6 +141,8 @@ "poll_votes_choices": "Choices", "poll_votes_delete": "Delete vote?", "poll_votes_results": "Result", + "poll_votes_scores": "Score", + "poll_votes_totals": "Total", "poll_votes_eliminated": "Eliminated", "poll_votes_noVote": "No vote", "poll_votes_results_unit_1_one": "vote", 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 1efbff13..dfc12241 100644 --- a/pollen-ui-riot-js/src/main/web/i18n/fr.json +++ b/pollen-ui-riot-js/src/main/web/i18n/fr.json @@ -78,6 +78,8 @@ "poll_results_rank": "Rang", "poll_results_choices": "Choix", "poll_results_results": "Résultat", + "poll_results_scores": "Scores", + "poll_results_totals": "Totaux", "poll_results_eliminated": "Éliminé", "poll_results_unit_1_one": "vote", "poll_results_unit_1_many": "votes", @@ -139,6 +141,8 @@ "poll_votes_choices": "Choix", "poll_votes_delete": "Supprimer le vote ?", "poll_votes_results": "Résultat", + "poll_votes_scores": "Score", + "poll_votes_totals": "Total", "poll_votes_eliminated": "Éliminé", "poll_votes_noVote": "Aucun vote", "poll_votes_results_unit_1_one": "vote", diff --git a/pollen-ui-riot-js/src/main/web/tag/poll/EditVote.tag.html b/pollen-ui-riot-js/src/main/web/tag/poll/EditVote.tag.html index 981b9b7c..4e036616 100644 --- a/pollen-ui-riot-js/src/main/web/tag/poll/EditVote.tag.html +++ b/pollen-ui-riot-js/src/main/web/tag/poll/EditVote.tag.html @@ -44,7 +44,9 @@ </div> </div> <div if={poll.resultIsVisible} class="result-label"> - <strong>{__.results}</strong> + <strong if={(poll.voteCountingType !== 5) && (poll.voteCountingType !== 2) && (poll.voteCountingType !== 4)}>{__.results}</strong> + <strong if={(poll.voteCountingType === 5) || (poll.voteCountingType === 2)}>{__.scores}</strong> + <strong if={(poll.voteCountingType === 4)}>{__.totals}</strong> </div> </div> <div each={choice, index in poll.choices} class="choice separator-top"> 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 7df347ab..3ef8dce0 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 @@ -35,7 +35,9 @@ require("../voteCountingType/MajorityJudgmentDetailResult.tag.html"); <thead> <tr> <th>{__.rank}</th> - <th>{__.results}</th> + <th if={(poll.voteCountingType !== 5) && (poll.voteCountingType !== 2) && (poll.voteCountingType !== 4)}>{__.results}</th> + <th if={(poll.voteCountingType === 5) || (poll.voteCountingType === 2)}>{__.scores}</th> + <th if={(poll.voteCountingType === 4)}>{__.totals}</th> <th>{__.choices}</th> </tr> </thead> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.