Author: tchemit Date: 2012-05-28 18:10:06 +0200 (Mon, 28 May 2012) New Revision: 3396 Url: http://chorem.org/repositories/revision/pollen/3396 Log: optimize i18n Modified: trunk/pollen-persistence/src/main/resources/i18n/pollen-persistence_en_GB.properties trunk/pollen-persistence/src/main/resources/i18n/pollen-persistence_fr_FR.properties trunk/pollen-services/src/main/resources/i18n/pollen-services_en_GB.properties trunk/pollen-services/src/main/resources/i18n/pollen-services_fr_FR.properties 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/vote.jsp Modified: trunk/pollen-persistence/src/main/resources/i18n/pollen-persistence_en_GB.properties =================================================================== --- trunk/pollen-persistence/src/main/resources/i18n/pollen-persistence_en_GB.properties 2012-05-28 15:34:46 UTC (rev 3395) +++ trunk/pollen-persistence/src/main/resources/i18n/pollen-persistence_en_GB.properties 2012-05-28 16:10:06 UTC (rev 3396) @@ -1,6 +1,5 @@ pollen.application.config=Pollen configuration pollen.configuration.adminEmail=email for default admin -pollen.configuration.applicationVersion=Application version pollen.configuration.charset=Charset used by Pollen pollen.configuration.contactEmail=email for contact link pollen.configuration.dataDirectory=Directory where to put pollen data Modified: trunk/pollen-persistence/src/main/resources/i18n/pollen-persistence_fr_FR.properties =================================================================== --- trunk/pollen-persistence/src/main/resources/i18n/pollen-persistence_fr_FR.properties 2012-05-28 15:34:46 UTC (rev 3395) +++ trunk/pollen-persistence/src/main/resources/i18n/pollen-persistence_fr_FR.properties 2012-05-28 16:10:06 UTC (rev 3396) @@ -1,6 +1,5 @@ pollen.application.config=Configuration de Pollen pollen.configuration.adminEmail=Email de l'utilisateur par défaut (Utilisateur crée lors du premier lancement de pollen) -pollen.configuration.applicationVersion=Version de l'application pollen.configuration.charset=Encoding utilisé par Pollen pollen.configuration.contactEmail=Email pour le lien Contact pollen.configuration.dataDirectory=Répertoire des données de Pollen Modified: trunk/pollen-services/src/main/resources/i18n/pollen-services_en_GB.properties =================================================================== --- trunk/pollen-services/src/main/resources/i18n/pollen-services_en_GB.properties 2012-05-28 15:34:46 UTC (rev 3395) +++ trunk/pollen-services/src/main/resources/i18n/pollen-services_en_GB.properties 2012-05-28 16:10:06 UTC (rev 3396) @@ -1,8 +1,3 @@ -add=Add -create=Create -delete=Delete -edit=Edit -help=Help pollen.common.addingChoicesAlways=Always pollen.common.addingChoicesContent=From %s to %s pollen.common.addingChoicesFrom=From %s @@ -43,14 +38,3 @@ pollen.feed.pollTitle=Pollen \: %s pollen.info.admin.created=Super admin was created with login %1$s pollen.info.admin.exists=Super admin already exists -pollen.ui.user.delete=Delete this user account -pollen.ui.user.edit=Edit this user account -reminderEmail_msg=You have not yet voted for the poll "%s".\nYou can still participate with the identifier %s by following this link\: \n%s -reminderEmail_subject=[Pollen] Reminder (%s) -return=Return -save=Save -validate=Validate -voteEmail_msg=A vote has been submitted for the poll "%s". There are now %d votes for this poll.\nYou can access to this poll by following the links below.\n\nVote page\: \n%s\nEdit page\: \n%s -voteEmail_subject=[Pollen] Vote reporting (%s) -votingEmail_msg=A new poll has been created\: "%s".\nYou can participate with the identifier %s by following this link\: \n%s -votingEmail_subject=[Pollen] Invitation to vote (%s) Modified: trunk/pollen-services/src/main/resources/i18n/pollen-services_fr_FR.properties =================================================================== --- trunk/pollen-services/src/main/resources/i18n/pollen-services_fr_FR.properties 2012-05-28 15:34:46 UTC (rev 3395) +++ trunk/pollen-services/src/main/resources/i18n/pollen-services_fr_FR.properties 2012-05-28 16:10:06 UTC (rev 3396) @@ -1,8 +1,3 @@ -email-label=Email -firstName-label=Prénom -lastName-label=Nom -login-label=Identifiant -name-label=Nom pollen.common.addingChoicesAlways=Toujours pollen.common.addingChoicesContent=Du %s au %s pollen.common.addingChoicesFrom=Depuis le %s 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-05-28 15:34:46 UTC (rev 3395) +++ trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_en_GB.properties 2012-05-28 16:10:06 UTC (rev 3396) @@ -132,7 +132,6 @@ pollen.common.vote.return=Back to poll pollen.common.vote.return-help=Back to poll pollen.common.voteAction=Vote -pollen.common.voteCounting-label=Vote Counting\: pollen.common.voteCountingType=Response type pollen.common.voteCountingType.help=Normal\: selecting 1 to n choices among available choices <br/><br/> Percentage\: allocating a percentage to each choice <br/><br/> Condorcet\: ranking choices in order of preference <br/><br/> Number \: Free response. Summed and the average numbers. pollen.common.voteCountingTypeHelp.condorcet=Condorcet vote\: rank choices by preference order from 1 to N (1\=favorite). Only the rank is taken into account, not the values. Two choices can have the same value. @@ -212,14 +211,12 @@ pollen.image.not.loaded=Image not loaded pollen.information.confirmClonePoll=Confirm clone of poll\: pollen.information.confirmClosePoll=Confirm close of poll\: -pollen.information.confirmDeleteChoice=Confirm delete of choice %s pollen.information.confirmDeleteFavoriteList=Confirm delete of favorite list\: pollen.information.confirmDeletePoll=Confirm delete of poll\: pollen.information.confirmDeletePollAccount=Confirm to delete voting\: pollen.information.confirmDeletePollChoice=Confir to delete choice %s pollen.information.confirmDeletePollVote=Confirm delete of vote of %s pollen.information.confirmDeleteUser=Confirm delete of user\: -pollen.information.confirmDeleteVote=Confirm delete of vote for %s pollen.information.favoriteList.created=Favorite list %s created. pollen.information.favoriteList.deleted=Favorite list %s deleted. pollen.information.irreversible.operation=Be ware, this operation is irreversible. 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-05-28 15:34:46 UTC (rev 3395) +++ trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_fr_FR.properties 2012-05-28 16:10:06 UTC (rev 3396) @@ -110,6 +110,7 @@ pollen.common.pollOption.maxChoiceNb=Limite pollen.common.pollOption.notification=Recevoir des emails de notification pollen.common.pollOption.notification.help=Un email vous est envoyé à chaque vote +pollen.common.pollOption.notificationNumber=Après n votes pollen.common.pollOption.publicResults=Résultats publics pollen.common.pollOption.publicResults.help=Les résultats du sondage sont consultables par tout le monde pollen.common.pollOption.reminder=Envoyer des emails de rappel Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/vote.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/vote.jsp 2012-05-28 15:34:46 UTC (rev 3395) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/vote.jsp 2012-05-28 16:10:06 UTC (rev 3396) @@ -260,7 +260,7 @@ <tr> <s:if test="accountFieldDisplayed"> <th id="voterName"> - <s:textfield key='pollAccount.votingId' required="true" + <s:textfield key='pollAccount.votingId' required="true" label='' value="%{pollAccount.votingId}" theme="simple"/> </th> </s:if>