Author: tchemit Date: 2010-03-15 23:23:55 +0100 (Mon, 15 Mar 2010) New Revision: 2945 Log: - application does not run with SendEmail as service (floarian has forgot something...) - use tapestry-bundle from i18n plugin Added: trunk/pollen-ui/src/main/resources/i18n/ trunk/pollen-ui/src/main/resources/i18n/pollen-ui-en_GB.properties trunk/pollen-ui/src/main/resources/i18n/pollen-ui-fr_FR.properties Removed: trunk/pollen-ui/src/main/webapp/WEB-INF/app_en.properties trunk/pollen-ui/src/main/webapp/WEB-INF/app_fr.properties Modified: trunk/pollen-ui/pom.xml trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/pages/poll/PollCreation.java Modified: trunk/pollen-ui/pom.xml =================================================================== --- trunk/pollen-ui/pom.xml 2010-03-15 22:20:47 UTC (rev 2944) +++ trunk/pollen-ui/pom.xml 2010-03-15 22:23:55 UTC (rev 2945) @@ -97,6 +97,9 @@ <properties> <redmine.releaseFiles>target/${project.build.finalName}.war</redmine.releaseFiles> + + <i18n.collectOutputName>app</i18n.collectOutputName> + <i18n.bundleOutputName>app</i18n.bundleOutputName> </properties> <reporting> @@ -119,6 +122,20 @@ <!-- Add main class into war to make it executable --> <plugins> + + <plugin> + <groupId>org.nuiton.i18n</groupId> + <artifactId>maven-i18n-plugin</artifactId> + <executions> + <execution> + <goals> + <goal>tapestry-bundle</goal> + </goals> + </execution> + + </executions> + </plugin> + <plugin> <artifactId>maven-war-plugin</artifactId> <configuration> Modified: trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/pages/poll/PollCreation.java =================================================================== --- trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/pages/poll/PollCreation.java 2010-03-15 22:20:47 UTC (rev 2944) +++ trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/pages/poll/PollCreation.java 2010-03-15 22:23:55 UTC (rev 2945) @@ -315,8 +315,8 @@ @Inject private ServiceList serviceList; - @Inject - private SendMail sendMailService; +// @Inject +// private SendMail sendMailService; /** * Méthode appelée lorsqu'on souhaite accéder à l'étape suivante de la @@ -854,14 +854,14 @@ } // send mail preparation - try { - sendMailService.prepareMails(poll.getId(), mailList); - sendMailService.wakeUp(); - } catch (IOException ex) { - if (log.isErrorEnabled()) { - log.error("Can't prepare send mail on disk, mail won't be send !!!", ex); - } - } +// try { +// sendMailService.prepareMails(poll.getId(), mailList); +// sendMailService.wakeUp(); +// } catch (IOException ex) { +// if (log.isErrorEnabled()) { +// log.error("Can't prepare send mail on disk, mail won't be send !!!", ex); +// } +// } } } Copied: trunk/pollen-ui/src/main/resources/i18n/pollen-ui-en_GB.properties (from rev 2943, trunk/pollen-ui/src/main/webapp/WEB-INF/app_en.properties) =================================================================== --- trunk/pollen-ui/src/main/resources/i18n/pollen-ui-en_GB.properties (rev 0) +++ trunk/pollen-ui/src/main/resources/i18n/pollen-ui-en_GB.properties 2010-03-15 22:23:55 UTC (rev 2945) @@ -0,0 +1,42 @@ +# User registration emails +registerEmail_subject=[Pollen] Confirmation of account creation %s +registerEmail_msg=Welcome %s %s. You had just created an account on the web application Pollen.\n\nLogin: %s\nPassword: %s\n\nYou can now manage your polls by logging on the website : \n%s + +# Poll creation emails +creatorEmail_subject=[Pollen] Poll creation (%s) +creatorEmail_msg=You had just created the new poll: "%s".\nYou can access to this poll by following the links below.\n\nVote page: \n%s\nEdit page: \n%s +votingEmail_subject=[Pollen] Invitation to vote (%s) +votingEmail_msg=A new poll has been created: "%s".\nYou can participate with the identifier %s by following this link: \n%s + +# Notification emails +voteEmail_subject=[Pollen] Vote reporting (%s) +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 + +# Reminder emails +reminderEmail_subject=[Pollen] Reminder (%s) +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 + +# Poll feed +pollFeed_title=Pollen : %s +pollFeed_desc=%s +pollFeed_createTitle=Poll created by %s +pollFeed_createContent= +pollFeed_voteTitle=New vote from %s +pollFeed_voteContent=Poll state : %s +pollFeed_choiceTitle=New choice : %s +pollFeed_choiceContent=%s +pollFeed_commentTitle=New comment from %s +pollFeed_commentContent=%s + +# Actions +create=Create +edit=Edit +delete=Delete +add=Add +save=Save +load=Load +ok=Ok +validate=Validate +cancel=Cancel +return=Return +help=Help \ No newline at end of file Copied: trunk/pollen-ui/src/main/resources/i18n/pollen-ui-fr_FR.properties (from rev 2943, trunk/pollen-ui/src/main/webapp/WEB-INF/app_fr.properties) =================================================================== --- trunk/pollen-ui/src/main/resources/i18n/pollen-ui-fr_FR.properties (rev 0) +++ trunk/pollen-ui/src/main/resources/i18n/pollen-ui-fr_FR.properties 2010-03-15 22:23:55 UTC (rev 2945) @@ -0,0 +1,42 @@ +# User registration emails +registerEmail_subject=[Pollen] Confirmation de cr\u00e9ation du compte %s +registerEmail_msg=Bienvenue %s %s. Vous venez de cr\u00e9er un compte sur l'application de sondage en ligne Pollen.\n\nIdentifiant : %s\nMot de passe : %s\n\nVous pouvez d\u00e8s maintenant g\u00e9rer vos sondages en vous identifiant sur le site : \n%s + +# Poll creation emails +creatorEmail_subject=[Pollen] Cr\u00e9ation d'un sondage (%s) +creatorEmail_msg=Vous venez de cr\u00e9er le sondage "%s".\nVous pouvez y acc\u00e9der en suivant les liens ci-dessous.\n\nPage de vote : \n%s\nPage de modification : \n%s +votingEmail_subject=[Pollen] Invitation au vote (%s) +votingEmail_msg=Un nouveau sondage a \u00e9t\u00e9 cr\u00e9\u00e9 : "%s".\nVous pouvez y participer avec l'identifiant %s \u00e0 l'adresse suivante : \n%s + +# Notification emails +voteEmail_subject=[Pollen] Notification de vote (%s) +voteEmail_msg=Un vote vient d'\u00eatre enregistr\u00e9 pour le sondage "%s". Ce sondage compte d\u00e9sormais %d votes.\nVous pouvez acc\u00e9der \u00e0 ce sondage en suivant les liens ci-dessous.\n\nPage de vote : \n%s\nPage de modification : \n%s + +# Reminder emails +reminderEmail_subject=[Pollen] Rappel (%s) +reminderEmail_msg=Vous n'avez pas encore vot\u00e9 pour le sondage "%s".\nVous pouvez encore y participer avec l'identifiant %s \u00e0 l'adresse suivante : \n%s + +# Poll feed +pollFeed_title=Pollen : %s +pollFeed_desc=%s +pollFeed_createTitle=Sondage cr\u00e9\u00e9 par %s +pollFeed_createContent= +pollFeed_voteTitle=Nouveau vote de %s +pollFeed_voteContent=\u00c9tat du sondage : %s +pollFeed_choiceTitle=Nouveau choix : %s +pollFeed_choiceContent=%s +pollFeed_commentTitle=Nouveau commentaire de %s +pollFeed_commentContent=%s + +# Actions +create=Cr\u00e9er +edit=Modifier +delete=Supprimer +add=Ajouter +save=Enregistrer +load=Charger +ok=Ok +validate=Valider +cancel=Annuler +return=Retour +help=Aide Deleted: trunk/pollen-ui/src/main/webapp/WEB-INF/app_en.properties =================================================================== --- trunk/pollen-ui/src/main/webapp/WEB-INF/app_en.properties 2010-03-15 22:20:47 UTC (rev 2944) +++ trunk/pollen-ui/src/main/webapp/WEB-INF/app_en.properties 2010-03-15 22:23:55 UTC (rev 2945) @@ -1,42 +0,0 @@ -# User registration emails -registerEmail_subject=[Pollen] Confirmation of account creation %s -registerEmail_msg=Welcome %s %s. You had just created an account on the web application Pollen.\n\nLogin: %s\nPassword: %s\n\nYou can now manage your polls by logging on the website : \n%s - -# Poll creation emails -creatorEmail_subject=[Pollen] Poll creation (%s) -creatorEmail_msg=You had just created the new poll: "%s".\nYou can access to this poll by following the links below.\n\nVote page: \n%s\nEdit page: \n%s -votingEmail_subject=[Pollen] Invitation to vote (%s) -votingEmail_msg=A new poll has been created: "%s".\nYou can participate with the identifier %s by following this link: \n%s - -# Notification emails -voteEmail_subject=[Pollen] Vote reporting (%s) -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 - -# Reminder emails -reminderEmail_subject=[Pollen] Reminder (%s) -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 - -# Poll feed -pollFeed_title=Pollen : %s -pollFeed_desc=%s -pollFeed_createTitle=Poll created by %s -pollFeed_createContent= -pollFeed_voteTitle=New vote from %s -pollFeed_voteContent=Poll state : %s -pollFeed_choiceTitle=New choice : %s -pollFeed_choiceContent=%s -pollFeed_commentTitle=New comment from %s -pollFeed_commentContent=%s - -# Actions -create=Create -edit=Edit -delete=Delete -add=Add -save=Save -load=Load -ok=Ok -validate=Validate -cancel=Cancel -return=Return -help=Help \ No newline at end of file Deleted: trunk/pollen-ui/src/main/webapp/WEB-INF/app_fr.properties =================================================================== --- trunk/pollen-ui/src/main/webapp/WEB-INF/app_fr.properties 2010-03-15 22:20:47 UTC (rev 2944) +++ trunk/pollen-ui/src/main/webapp/WEB-INF/app_fr.properties 2010-03-15 22:23:55 UTC (rev 2945) @@ -1,42 +0,0 @@ -# User registration emails -registerEmail_subject=[Pollen] Confirmation de création du compte %s -registerEmail_msg=Bienvenue %s %s. Vous venez de créer un compte sur l'application de sondage en ligne Pollen.\n\nIdentifiant : %s\nMot de passe : %s\n\nVous pouvez dès maintenant gérer vos sondages en vous identifiant sur le site : \n%s - -# Poll creation emails -creatorEmail_subject=[Pollen] Création d'un sondage (%s) -creatorEmail_msg=Vous venez de créer le sondage "%s".\nVous pouvez y accéder en suivant les liens ci-dessous.\n\nPage de vote : \n%s\nPage de modification : \n%s -votingEmail_subject=[Pollen] Invitation au vote (%s) -votingEmail_msg=Un nouveau sondage a été créé : "%s".\nVous pouvez y participer avec l'identifiant %s à l'adresse suivante : \n%s - -# Notification emails -voteEmail_subject=[Pollen] Notification de vote (%s) -voteEmail_msg=Un vote vient d'être enregistré pour le sondage "%s". Ce sondage compte désormais %d votes.\nVous pouvez accéder à ce sondage en suivant les liens ci-dessous.\n\nPage de vote : \n%s\nPage de modification : \n%s - -# Reminder emails -reminderEmail_subject=[Pollen] Rappel (%s) -reminderEmail_msg=Vous n'avez pas encore voté pour le sondage "%s".\nVous pouvez encore y participer avec l'identifiant %s à l'adresse suivante : \n%s - -# Poll feed -pollFeed_title=Pollen : %s -pollFeed_desc=%s -pollFeed_createTitle=Sondage créé par %s -pollFeed_createContent= -pollFeed_voteTitle=Nouveau vote de %s -pollFeed_voteContent=État du sondage : %s -pollFeed_choiceTitle=Nouveau choix : %s -pollFeed_choiceContent=%s -pollFeed_commentTitle=Nouveau commentaire de %s -pollFeed_commentContent=%s - -# Actions -create=Créer -edit=Modifier -delete=Supprimer -add=Ajouter -save=Enregistrer -load=Charger -ok=Ok -validate=Valider -cancel=Annuler -return=Retour -help=Aide \ No newline at end of file