Author: tchemit Date: 2012-06-20 12:56:10 +0200 (Wed, 20 Jun 2012) New Revision: 3543 Url: http://chorem.org/repositories/revision/pollen/3543 Log: - fixes #177: [Results] pas le nombre total de votants - fixes #628: Improve nb votes messages + use warning messages on vote page when needed Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AbstractVoteAction.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ResultForPoll.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/VoteForPoll.java trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_en_GB.properties trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_fr_FR.properties trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/result.jsp Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AbstractVoteAction.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AbstractVoteAction.java 2012-06-20 10:46:32 UTC (rev 3542) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AbstractVoteAction.java 2012-06-20 10:56:10 UTC (rev 3543) @@ -220,7 +220,17 @@ } public String getVoteSizeMessage() { - return _("pollen.common.voteNbVotes", getPoll().sizeVote()); + int i = getPoll().sizeVote(); + + String result; + if (i==0) { + result = _("pollen.common.voteNoVote"); + } else if (i==1) { + result = _("pollen.common.voteOneVote"); + }else { + result = _("pollen.common.voteNbVotes", i); + } + return result; } public String getCommentAuthor() { Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ResultForPoll.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ResultForPoll.java 2012-06-20 10:46:32 UTC (rev 3542) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ResultForPoll.java 2012-06-20 10:56:10 UTC (rev 3543) @@ -182,6 +182,20 @@ return subtitles; } + public String getVoteSizeMessage() { + int i = getPoll().sizeVote(); + + String result; + if (i==0) { + result = _("pollen.common.voteNoVote"); + } else if (i==1) { + result = _("pollen.common.voteOneVote"); + }else { + result = _("pollen.common.voteNbVotes", i); + } + return result; + } + public String getVictoryMessage() { String victoryMessage; Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/VoteForPoll.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/VoteForPoll.java 2012-06-20 10:46:32 UTC (rev 3542) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/VoteForPoll.java 2012-06-20 10:56:10 UTC (rev 3543) @@ -60,11 +60,11 @@ // Messages if (getPoll().isClosed()) { - addFlashMessage(_("pollen.information.pollClosed")); + addFlashWarning(_("pollen.information.pollClosed")); } else if (!isPollStarted()) { - addFlashMessage(_("pollen.information.pollNotStarted")); + addFlashWarning(_("pollen.information.pollNotStarted")); } else if (isPollFinished()) { - addFlashMessage(_("pollen.information.pollFinished")); + addFlashWarning(_("pollen.information.pollFinished")); } if (isPollChoiceRunning()) { addFlashMessage(_("pollen.information.pollChoiceRunning")); Modified: trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_en_GB.properties =================================================================== --- trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_en_GB.properties 2012-06-20 10:46:32 UTC (rev 3542) +++ trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_en_GB.properties 2012-06-20 10:56:10 UTC (rev 3543) @@ -157,6 +157,8 @@ pollen.common.voteCountingTypeHelp.number=Voting by number\: The answer is free, leave blank or enter a integer. pollen.common.voteCountingTypeHelp.percentage=Percentage vote\: allocate choices to get a 100%% total. pollen.common.voteNbVotes=%d existing votes +pollen.common.voteNoVote=No existing vote +pollen.common.voteOneVote=1 existing vote pollen.common.votePerson=Voter pollen.common.voterName=Votant pollen.common.votingList=Group Modified: trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_fr_FR.properties =================================================================== --- trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_fr_FR.properties 2012-06-20 10:46:32 UTC (rev 3542) +++ trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_fr_FR.properties 2012-06-20 10:56:10 UTC (rev 3543) @@ -157,6 +157,8 @@ pollen.common.voteCountingTypeHelp.number=Vote par nombre \: La réponse est libre, laissez vide ou entrez un nombre entier pollen.common.voteCountingTypeHelp.percentage=Vote par pourcentage \: répartir les choix de manière à obtenir 100%% au total. pollen.common.voteNbVotes=%d votes existants +pollen.common.voteNoVote=Pas de vote existant +pollen.common.voteOneVote=1 vote existant pollen.common.votePerson=Votant pollen.common.voterName=Votant pollen.common.votingList=Groupe Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/result.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/result.jsp 2012-06-20 10:46:32 UTC (rev 3542) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/result.jsp 2012-06-20 10:56:10 UTC (rev 3543) @@ -108,6 +108,10 @@ </fieldset> </div> +<h4> + <s:property value="%{voteSizeMessage}"/> +</h4> + <!-- Victoire --> <s:if test="victoryMessage != ''"> <h4><s:property value="victoryMessage"/>