Author: kmorin Date: 2013-05-06 15:01:52 +0200 (Mon, 06 May 2013) New Revision: 920 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/920 Log: fixes #2397 [AIDE] pr?\195?\169ciser le type de tri possible sur les traits Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/DecoratorService.java trunk/tutti-service/src/main/resources/i18n/tutti-service_en_GB.properties 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-05-06 07:25:47 UTC (rev 919) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/DecoratorService.java 2013-05-06 13:01:52 UTC (rev 920) @@ -143,6 +143,8 @@ n_("tutti.property.lastName"); n_("tutti.property.department"); n_("tutti.property.stationNumber"); + n_("tutti.property.fishingOperationNumber"); + n_("tutti.property.gearShootingStartDate"); n_("tutti.property.internationalRegistrationCode"); n_("tutti.property.date"); n_("tutti.property.program"); Modified: trunk/tutti-service/src/main/resources/i18n/tutti-service_en_GB.properties =================================================================== --- trunk/tutti-service/src/main/resources/i18n/tutti-service_en_GB.properties 2013-05-06 07:25:47 UTC (rev 919) +++ trunk/tutti-service/src/main/resources/i18n/tutti-service_en_GB.properties 2013-05-06 13:01:52 UTC (rev 920) @@ -20,8 +20,10 @@ tutti.property.firstName= tutti.property.fishingOperation= tutti.property.fishingOperationLocation= +tutti.property.fishingOperationNumber= tutti.property.fractionName= tutti.property.gear= +tutti.property.gearShootingStartDate= tutti.property.genusSpecies= tutti.property.internationalRegistrationCode= tutti.property.label= 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-05-06 07:25:47 UTC (rev 919) +++ trunk/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties 2013-05-06 13:01:52 UTC (rev 920) @@ -18,8 +18,10 @@ tutti.property.firstName=Prénom tutti.property.fishingOperation=Trait tutti.property.fishingOperationLocation=Lieu +tutti.property.fishingOperationNumber=Numéro de trait tutti.property.fractionName=Fraction tutti.property.gear=Engin +tutti.property.gearShootingStartDate=Date de début de traîne tutti.property.genusSpecies=Nom scientifique tutti.property.internationalRegistrationCode=Immatriculation internationale (ou nationale si non trouvée) tutti.property.label=Code