Author: fdesbois Date: 2010-02-23 19:47:57 +0100 (Tue, 23 Feb 2010) New Revision: 2880 Added: trunk/pollen-business/src/main/resources/i18n/ trunk/pollen-business/src/main/resources/i18n/pollen-business-en_GB.properties trunk/pollen-business/src/main/resources/i18n/pollen-business-fr_FR.properties Modified: trunk/pollen-business/pom.xml trunk/pollen-business/src/main/java/org/chorem/pollen/business/services/ServicePollImpl.java trunk/pollen-business/src/main/java/org/chorem/pollen/business/utils/ContextUtil.java trunk/pom.xml Log: Add error messages with i18n Modified: trunk/pollen-business/pom.xml =================================================================== --- trunk/pollen-business/pom.xml 2010-02-23 18:20:55 UTC (rev 2879) +++ trunk/pollen-business/pom.xml 2010-02-23 18:47:57 UTC (rev 2880) @@ -119,6 +119,31 @@ </execution> </executions> </plugin> + <plugin> + <groupId>org.nuiton.i18n</groupId> + <artifactId>maven-i18n-plugin</artifactId> + <executions> + <execution> + <goals> + <goal>parserJava</goal> + <goal>gen</goal> + </goals> + <!-- restrict parsing beacause this is expensive --> + <!-- if you want to parse more, add your package in includes --> + <configuration> + <treateDefaultEntry>false</treateDefaultEntry> + <entries> + <entry> + <basedir>${maven.src.dir}/main/java</basedir> + <includes> + <include>org/nuiton/topia/framework/*.java</include> + </includes> + </entry> + </entries> + </configuration> + </execution> + </executions> + </plugin> <!--<plugin> <groupId>org.nuiton.eugene</groupId> <artifactId>maven-eugene-plugin</artifactId> Modified: trunk/pollen-business/src/main/java/org/chorem/pollen/business/services/ServicePollImpl.java =================================================================== --- trunk/pollen-business/src/main/java/org/chorem/pollen/business/services/ServicePollImpl.java 2010-02-23 18:20:55 UTC (rev 2879) +++ trunk/pollen-business/src/main/java/org/chorem/pollen/business/services/ServicePollImpl.java 2010-02-23 18:47:57 UTC (rev 2880) @@ -51,6 +51,7 @@ import org.chorem.pollen.business.utils.ContextUtil; import org.nuiton.topia.TopiaContext; import org.nuiton.topia.TopiaException; +import static org.nuiton.i18n.I18n._; /** * Implémentation du service de gestion des sondages. @@ -78,13 +79,14 @@ @Override public String createPoll(PollDTO pollDTO) { TopiaContext transaction = null; + String result = null; try { transaction = rootContext.beginTransaction(); pollDAO = PollenModelDAOHelper.getPollDAO(transaction); String pollId = ContextUtil.createPollenUrlId(); - Poll entity = ConverterHelper.convert(pollDTO, pollDAO.create(pollId)); + Poll entity = ConverterHelper.convert(pollDTO, pollDAO.create()); // ** Creator managment PollAccount creator = prepareCreator(transaction, pollDTO); @@ -118,13 +120,15 @@ log.debug("Entity created: " + entity); } - return entity.getTopiaId(); - } catch (Exception e) { - ContextUtil.doCatch(e, transaction); - return ""; + result = entity.getTopiaId(); + } catch (Exception eee) { + ContextUtil.doCatch(eee, transaction, + _("pollen.error.servicePoll.createPoll", + pollDTO.getTitle(), pollDTO.getCreatorId())); } finally { ContextUtil.doFinally(transaction); } + return result; } @@ -247,7 +251,9 @@ return true; } catch (Exception e) { - ContextUtil.doCatch(e, transaction); + ContextUtil.doCatch(e, transaction, + _("pollen.error.servicePoll.updatePoll", + pollDTO.getTitle(), pollDTO.getPollId())); return false; } finally { ContextUtil.doFinally(transaction); Modified: trunk/pollen-business/src/main/java/org/chorem/pollen/business/utils/ContextUtil.java =================================================================== --- trunk/pollen-business/src/main/java/org/chorem/pollen/business/utils/ContextUtil.java 2010-02-23 18:20:55 UTC (rev 2879) +++ trunk/pollen-business/src/main/java/org/chorem/pollen/business/utils/ContextUtil.java 2010-02-23 18:47:57 UTC (rev 2880) @@ -30,6 +30,7 @@ import org.chorem.pollen.business.persistence.UserAccount; import org.chorem.pollen.business.persistence.UserAccountDAO; import org.hibernate.exception.SQLGrammarException; +import org.nuiton.i18n.I18n; import org.nuiton.topia.TopiaContext; import org.nuiton.topia.TopiaContextFactory; import org.nuiton.topia.TopiaException; @@ -181,6 +182,8 @@ conf.setProperty("topia.service.migration.version", PollenModelDAOHelper .getModelVersion()); + I18n.init(); + // Construction du contexte global buildContext(); Added: trunk/pollen-business/src/main/resources/i18n/pollen-business-en_GB.properties =================================================================== --- trunk/pollen-business/src/main/resources/i18n/pollen-business-en_GB.properties (rev 0) +++ trunk/pollen-business/src/main/resources/i18n/pollen-business-en_GB.properties 2010-02-23 18:47:57 UTC (rev 2880) @@ -0,0 +1 @@ +pollen.error.servicePoll.createPoll= Added: trunk/pollen-business/src/main/resources/i18n/pollen-business-fr_FR.properties =================================================================== --- trunk/pollen-business/src/main/resources/i18n/pollen-business-fr_FR.properties (rev 0) +++ trunk/pollen-business/src/main/resources/i18n/pollen-business-fr_FR.properties 2010-02-23 18:47:57 UTC (rev 2880) @@ -0,0 +1,2 @@ +pollen.error.servicePoll.createPoll=Impossible d'enregistrer le sondage %1$s cr\u00E9\u00E9 par %2$s +pollen.error.servicePoll.updatePoll=Impossible de mettre \u00E0 jour le sondage %1$s (%2$s) Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-02-23 18:20:55 UTC (rev 2879) +++ trunk/pom.xml 2010-02-23 18:47:57 UTC (rev 2880) @@ -301,6 +301,7 @@ <!--javadoc.version>2.4</javadoc.version--> <topia.version>2.3.0-beta-9-SNAPSHOT</topia.version> <eugene.version>2.0.0-beta-4</eugene.version> + <i18n.version>1.0.1</i18n.version> <tapestry.version>5.1.0.5</tapestry.version> <nuiton-utils.version>1.1.5-SNAPSHOT</nuiton-utils.version> <!-- <chorem-commons.version>1.0.0-alpha-2-SNAPSHOT</chorem-commons.version>--> @@ -351,6 +352,11 @@ </dependency> </dependencies> </plugin> + <plugin> + <groupId>org.nuiton.i18n</groupId> + <artifactId>maven-i18n-plugin</artifactId> + <version>${i18n.version}</version> + </plugin> </plugins> </pluginManagement>