Author: tchemit Date: 2013-01-30 13:31:40 +0100 (Wed, 30 Jan 2013) New Revision: 267 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/267 Log: fix decoration Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/DecoratorService.java trunk/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/DecoratorService.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/DecoratorService.java 2013-01-30 11:29:37 UTC (rev 266) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/DecoratorService.java 2013-01-30 12:31:40 UTC (rev 267) @@ -104,7 +104,7 @@ registerMultiJXPathDecorator(Program.class, "${name}$s", SEPARATOR, " - "); registerMultiJXPathDecorator(Cruise.class, "${name}$s", SEPARATOR, " - "); registerMultiJXPathDecorator(TuttiProtocol.class, "${name}$s", SEPARATOR, " - "); - registerMultiJXPathDecorator(FishingOperation.class, "${stationNumber}$s#${fishingOperationNumber}$s#${trawlNetNumber}$s#${gearShootingStartDate}$td/%3$tm/%3$tY", SEPARATOR, " - "); + registerMultiJXPathDecorator(FishingOperation.class, "${stationNumber}$s#${fishingOperationNumber}$s#${multirigAggregation}$s#${gearShootingStartDate}$td/%4$tm/%4$tY", SEPARATOR, " - "); registerMultiJXPathDecorator(Zone.class, "${label}$s#${name}$s", SEPARATOR, " - "); registerMultiJXPathDecorator(Vessel.class, "${name}$s#${internalRegistrationCode}$s", SEPARATOR, " - "); registerMultiJXPathDecorator(Country.class, "${label}$s#${name}$s", SEPARATOR, " - "); @@ -161,7 +161,8 @@ n_("tutti.property.sortedUnsortedCategory"); n_("tutti.property.macroWasteCategory"); n_("tutti.property.attachment"); - n_("tutti.property.trawlNetNumber"); + n_("tutti.property.multirigAggregation"); + n_("tutti.property.caracteristic"); } } Modified: trunk/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties =================================================================== --- trunk/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties 2013-01-30 11:29:37 UTC (rev 266) +++ trunk/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties 2013-01-30 12:31:40 UTC (rev 267) @@ -4,6 +4,7 @@ tutti.config.license.organizationName=Nom de l'organisation dans la licence tutti.config.tmp.directory=Répertoire temporaire utilisée par l'application (est nettoyé à chaque démarrage de l'application) tutti.property.attachment=Pièce jointe +tutti.property.caracteristic=Caractéristique tutti.property.codeMemo=Code Memo tutti.property.country=Pays tutti.property.cruise=Campagne @@ -20,6 +21,7 @@ tutti.property.macroWasteCategory=Type de macro déchet tutti.property.matrixName=Support tutti.property.methodName=Méthode +tutti.property.multirigAggregation=Numéro de poche tutti.property.name=Nom tutti.property.parameterName=Paramètre tutti.property.program=Série de campagne @@ -28,7 +30,6 @@ tutti.property.species=Espèce tutti.property.stationNumber=Numéro de station tutti.property.strata=Strate d'association -tutti.property.trawlNetNumber=Numéro de poche tutti.property.user=Utilisateur tutti.property.vessel=Navire tutti.property.zone=Zone