Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: b88780bc by Tony CHEMIT at 2017-07-28T20:10:25+02:00 Re-add supportVesselName on FloatingObject (See #803) (update test databases) - - - - - 1a9e2945 by Tony CHEMIT at 2017-07-28T21:01:14+02:00 Maintenant on check les validator i18n field dans services-runner mais d'ici on n'exporte pas i18n même si on pourrait le croire^^ - - - - - 24 changed files: - application-swing-validation/pom.xml - application-swing-validation/src/main/resources/i18n/application-swing-validation_en_GB.properties - application-swing-validation/src/main/resources/i18n/application-swing-validation_es_ES.properties - application-swing-validation/src/main/resources/i18n/application-swing-validation_fr_FR.properties - services-runner/pom.xml - + services-runner/src/main/resources/i18n/services-runner_en_GB.properties - + services-runner/src/main/resources/i18n/services-runner_es_ES.properties - + services-runner/src/main/resources/i18n/services-runner_fr_FR.properties - services-validation/pom.xml - services-validation/src/main/resources/i18n/services-validation_en_GB.properties - services-validation/src/main/resources/i18n/services-validation_es_ES.properties - services-validation/src/main/resources/i18n/services-validation_fr_FR.properties - services/pom.xml - services/src/main/java/fr/ird/observe/services/ObserveDtoInitializer.java - services/src/main/java/fr/ird/observe/services/decoration/ObserveI18nDecoratorHelper.java - services/src/main/resources/i18n/services_en_GB.properties - services/src/main/resources/i18n/services_es_ES.properties - services/src/main/resources/i18n/services_fr_FR.properties - test/src/main/resources/db/6.901/dataForTestLongline.sql.gz - test/src/main/resources/db/6.901/dataForTestSeine.sql.gz - test/src/main/resources/db/6.901/empty_h2.sql.gz - test/src/main/resources/db/6.901/empty_pg.sql.gz - test/src/main/resources/db/6.901/referentiel.sql.gz - toolbox-maven-plugin/src/main/java/fr/ird/observe/maven/plugins/toolbox/GenerateI18nValidatorFieldsMojo.java Changes: ===================================== application-swing-validation/pom.xml ===================================== --- a/application-swing-validation/pom.xml +++ b/application-swing-validation/pom.xml @@ -117,24 +117,6 @@ <plugins> <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <executions> - <execution> - <id>compile-generated-sources</id> - <goals> - <goal>compile</goal> - </goals> - <phase>process-classes</phase> - <configuration> - <includes> - <include>**/I18nValidatorHelper.java</include> - </includes> - </configuration> - </execution> - </executions> - </plugin> - - <plugin> <groupId>${project.groupId}</groupId> <artifactId>toolbox-maven-plugin</artifactId> <version>${project.version}</version> @@ -143,15 +125,6 @@ </configuration> <executions> <execution> - <id>generate-i18n-validator-fields</id> - <goals> - <goal>generate-i18n-validator-fields</goal> - </goals> - <configuration> - <prefix>observe.common.</prefix> - </configuration> - </execution> - <execution> <id>generate-validators-descriptor</id> <goals> <goal>generate-validators-descriptor</goal> @@ -176,22 +149,12 @@ <goals> <goal>parserJava</goal> </goals> - <phase>process-classes</phase> - <configuration> - <entries> - <entry> - <specificGoal>parserJava</specificGoal> - <basedir>${project.build.directory}/generated-sources/java</basedir> - </entry> - </entries> - </configuration> </execution> <execution> <id>parse-validation</id> <goals> <goal>parserValidation</goal> </goals> - <phase>process-classes</phase> <configuration> <entries> <entry> @@ -208,7 +171,6 @@ <goals> <goal>gen</goal> </goals> - <phase>process-classes</phase> </execution> </executions> </plugin> ===================================== application-swing-validation/src/main/resources/i18n/application-swing-validation_en_GB.properties ===================================== --- a/application-swing-validation/src/main/resources/i18n/application-swing-validation_en_GB.properties +++ b/application-swing-validation/src/main/resources/i18n/application-swing-validation_en_GB.properties @@ -1,206 +1,3 @@ -observe.common.activityLongline=Activity -observe.common.activitySeine=Activity -observe.common.baitHaulingStatus=Bait hauling status -observe.common.baitSettingStatus=Bait setting status -observe.common.baitType=Bait type -observe.common.baitsComposition=Baits composition -observe.common.baitsCompositionProportionSum=Baits composition proportion sum -observe.common.basket=Basket -observe.common.basketsPerSectionCount=Basket per section count -observe.common.branchline=Branchline -observe.common.branchlineLength=Branchline length -observe.common.branchlinesComposition=Branchlines composition -observe.common.branchlinesCompositionProportionSum=Branchlines composition proportion sum -observe.common.branchlinesPerBasketCount=Branchlines per basket count -observe.common.brandName=Brand name -observe.common.capacity=Capacity -observe.common.capacityLabel=Capacity label -observe.common.captain=Captain -observe.common.catchFateLongline=Catch fate -observe.common.catchHealthness=Catch healthness -observe.common.catchWeight=Catch weight -observe.common.changeDate=Change date -observe.common.code=Code -observe.common.coefficients=Coefficients -observe.common.comment=Comment -observe.common.count=Count -observe.common.country=Country -observe.common.currentDirection=Current direction -observe.common.currentFpaZone=Current Fpa zone -observe.common.currentSpeed=Current speed -observe.common.dataEntryOperator=Data entry operator -observe.common.date=Date -observe.common.daysAtSeaCount=Days at sea count -observe.common.departureHarbour=Departure harbour -observe.common.deployementEnd=Deployement end -observe.common.description=Description -observe.common.detectionMode=Detection mode -observe.common.detectionTime=Detection time -observe.common.discardHealthness=Discard healthness -observe.common.distance=Distance -observe.common.encounterType=Encounter type -observe.common.endDate=End date -observe.common.endLogValue=End log value -observe.common.endPursingDate=End pursing date -observe.common.endPursingTimeStamp=End pursing timestamp -observe.common.endSetDate=End set date -observe.common.endSetTimeStamp=End set timestamp -observe.common.firstName=First name -observe.common.fishingEnd=Fishing end -observe.common.fishingStart=Fishing start -observe.common.flagCountry=Flag country -observe.common.fleetCountry=Fleet country -observe.common.floatingObjectEmpty=Floating object empty -observe.common.floatline1Length=floatline 1 length -observe.common.floatline2Length=floatline 2 length -observe.common.floatlinesComposition=floatlines composition -observe.common.floatlinesCompositionProportionSum=floatlines composition proportion sum -observe.common.formsUrl=Forms url -observe.common.fpaZone=Fpa zone -observe.common.gaugeLabel=Gauge label -observe.common.gear=Gear -observe.common.gearCaracteristicType=Gear caracteristic type -observe.common.gearType=Gear type -observe.common.gearUseFeaturesLongline=Gear use features -observe.common.gearUseFeaturesSeine=Gear use features -observe.common.gonadeWeight=Gonade weight -observe.common.haulingBreaks=Hauling breaks -observe.common.haulingDirectionSameAsSetting=Hauling direction same as setting -observe.common.haulingEndLatitude=Hauling end latitude -observe.common.haulingEndLongitude=Hauling end longitude -observe.common.haulingEndQuadrant=Hauling end quadrant -observe.common.haulingEndTimeStamp=Hauling end timeStamp -observe.common.haulingStartLatitude=Hauling start latitude -observe.common.haulingStartLongitude=Hauling start longitude -observe.common.haulingStartQuadrant=Hauling start quadrant -observe.common.haulingStartTimeStamp=Hauling start timeStamp -observe.common.hookOffset=Hook offset -observe.common.hookPosition=Hook position -observe.common.hookSize=Hook size -observe.common.hookType=Hook type -observe.common.hooksComposition=hooks composition -observe.common.hooksCompositionProportionSum=hooks composition proportion sum -observe.common.individualSize=Individual size -observe.common.individualWeight=Individual weight -observe.common.inputSizeMeasureType=Input size measure type -observe.common.iso2Code=Iso 2 code -observe.common.iso3Code=Iso 3 code -observe.common.itemHorizontalPosition=Item horizontal position -observe.common.itemVerticalPosition=Item vertical position -observe.common.keelCode=Keel code -observe.common.label1=English label -observe.common.label2=French label -observe.common.label3=Spanish label -observe.common.landingHarbour=Landing harbour -observe.common.lastName=Last name -observe.common.latitude=Latitude -observe.common.length=Length -observe.common.lightsticksColor=Lightsticks color -observe.common.lightsticksPerBasketCount=Lightsticks per basket count -observe.common.lightsticksType=Lightsticks type -observe.common.lineType=Line type -observe.common.locode=Locode -observe.common.longitude=Longitude -observe.common.maturityStatus=Maturity status -observe.common.maxDepthTargeted=Max depth targeted -observe.common.maxGearDepth=Max gear depth -observe.common.meanLength=Mean length -observe.common.meanWeight=Mean weight -observe.common.name=Name -observe.common.nextFpaZone=Next Fpa zone -observe.common.nonTargetCatch=Non target catch -observe.common.nonTargetCatchReleaseStatus=Release state -observe.common.number=Number -observe.common.objectFate=Object fate -observe.common.objectOperation=Object operation -observe.common.objectType=Object type -observe.common.observedSystem=Observed system -observe.common.observedSystemDistance=Observed system distance -observe.common.observer=Observed -observe.common.ocean=Ocean -observe.common.organism=Organism -observe.common.outputInputFormula=Output to Input formula -observe.common.outputSizeMeasureType=Output size measure type -observe.common.power=Power -observe.common.previousFpaZone=Previous Fpa zone -observe.common.proportion=Proportion -observe.common.quadrant=Quadrant -observe.common.reasonForDiscard=Reason for discad -observe.common.reasonForNoFishing=Reason for no fishing -observe.common.reasonForNullSet=Reason for null set -observe.common.releaseTime=Release time -observe.common.reportsUrl=Reports url -observe.common.route=Route -observe.common.schoolEstimate=School estimate -observe.common.schoolMeanDepth=School mean depth -observe.common.schoolThickness=School thickness -observe.common.schoolTopDepth=School top depth -observe.common.seaSurfaceTemperature=Sea surface temperature -observe.common.searchMaximum=Search maximum -observe.common.section=Section -observe.common.sensorBrand=Sensor brand -observe.common.sensorDataFormat=Sensor data format -observe.common.sensorSerialNo=Sensor serial no -observe.common.sensorType=Sensor type -observe.common.settingEndLatitude=Setting end latitude -observe.common.settingEndLongitude=Setting end longitude -observe.common.settingEndQuadrant=Setting end quadrant -observe.common.settingEndTimeStamp=Setting end timeStamp -observe.common.settingShape=Setting shape -observe.common.settingStartLatitude=Setting start latitude -observe.common.settingStartLongitude=Setting start longitude -observe.common.settingStartQuadrant=Setting start quadrant -observe.common.settingStartTimeStamp=Setting start timeStamp -observe.common.settingVesselSpeed=Setting vessel speed -observe.common.shipOwner=Ship owner -observe.common.shooterSpeed=Shooter speed -observe.common.sizeMeasureType=Size measure type -observe.common.snapWeight=Snap weight -observe.common.species=Species -observe.common.speciesCatch=Species -observe.common.speciesFate=Species fate -observe.common.speciesGroup=Species group -observe.common.speciesGroupReleaseMode=Release mode -observe.common.speciesStatus=Species status -observe.common.speedRange=Speed range -observe.common.startDate=Start date -observe.common.startLogValue=Start log value -observe.common.startTime=Sart time -observe.common.status=Status -observe.common.stomacFullness=Stomac fullness -observe.common.supportVesselName=Support vessel name -observe.common.surroundingActivity=Surrounding activity -observe.common.swivelWeight=Swivel weight -observe.common.targetCatch=Target catch -observe.common.time=Time -observe.common.timeBetweenHooks=Time between hooks -observe.common.topType=Top type -observe.common.totalBasketsCount=Total baskets count -observe.common.totalCount=Count -observe.common.totalHooksCount=Total hooks count -observe.common.totalSectionsCount=Total section count -observe.common.totalWeight=Total weight -observe.common.tracelineLength=Traceline length -observe.common.tracelineType=Traceline type -observe.common.transmittingBuoyOperation=Transmitting buoy operation -observe.common.transmittingBuoyType=Transmitting buoy type -observe.common.tripType=Trip type -observe.common.type=Type -observe.common.uri=Uri -observe.common.vessel=Boat -observe.common.vesselActivityLongline=Vessel activity -observe.common.vesselActivitySeine=Vessel activity -observe.common.vesselSizeCategory=Vessel size category -observe.common.vesselSpeed=Vessel spped -observe.common.vesselType=Vessel type -observe.common.waveHeight=Wave weight -observe.common.weight=Weight -observe.common.weightCategory=Weight category -observe.common.weightLengthFormula=Weight length formula -observe.common.well=Well -observe.common.wind=Wind -observe.common.wormsId=Worms id -observe.common.yearService=Year service validator.ui.activity.bound.latitude=Latitude must be between %1$s and %2$s. validator.ui.activity.bound.longitude=Longitude must be between %1$s and %2$s. validator.ui.activity.bound.seaSurfaceTemperature=Temperature must be between %1$s and %2$s. @@ -314,6 +111,7 @@ validator.ui.floatingObject.required.comment.for.type=A comment is required for validator.ui.floatingObject.required.objectFate=Object fate must be filled. validator.ui.floatingObject.required.objectOperation=Object operation must be filled. validator.ui.floatingObject.required.type=Type must be filled. +validator.ui.floatingObject.size.supportVesselName=Support vessel name size can not exceed 1024 characters. validator.ui.floatlinesComposition.bound.length=Length must be between %1$s and %2$s. validator.ui.floatlinesComposition.bound.proportion=Proportion must be between %1$s and %2$s. validator.ui.floatlinesComposition.desactivated.lineType=Selected line type is disabled. ===================================== application-swing-validation/src/main/resources/i18n/application-swing-validation_es_ES.properties ===================================== --- a/application-swing-validation/src/main/resources/i18n/application-swing-validation_es_ES.properties +++ b/application-swing-validation/src/main/resources/i18n/application-swing-validation_es_ES.properties @@ -1,206 +1,3 @@ -observe.common.activityLongline=Actividad -observe.common.activitySeine=Actividad -observe.common.baitHaulingStatus=Estatuto del cebo en el arrastre -observe.common.baitSettingStatus=Estatuto del cebo en la calada -observe.common.baitType=Tipo de cebo -observe.common.baitsComposition=Cebo -observe.common.baitsCompositionProportionSum=Suma de los proporciónes de cebo (%) -observe.common.basket=Cesta -observe.common.basketsPerSectionCount=Número de cestas por sección -observe.common.branchline=Arponcillo -observe.common.branchlineLength=Arponcillo (m) -observe.common.branchlinesComposition=Arponcillos -observe.common.branchlinesCompositionProportionSum=Suma de los proporciónes de arponcillos (%) -observe.common.branchlinesPerBasketCount=Número de anzuelos por cesta -observe.common.brandName=Marca -observe.common.capacity=Capacidad de transporte -observe.common.capacityLabel=Texto capacidad -observe.common.captain=Patrón -observe.common.catchFateLongline=Futuro de la captura -observe.common.catchHealthness=Salud a la captura -observe.common.catchWeight=Peso estimado (en t) -observe.common.changeDate=Fecha de carga -observe.common.code=Identificación -observe.common.coefficients=Coeficientes -observe.common.comment=Comentarios -observe.common.count=Número -observe.common.country=País -observe.common.currentDirection=Direction du courant (°) -observe.common.currentFpaZone=Zona FPA actual -observe.common.currentSpeed=Velocidad del corriente (nd) -observe.common.dataEntryOperator=Operador de captación de datos -observe.common.date=Día de observación -observe.common.daysAtSeaCount=Numero de días en el mar -observe.common.departureHarbour=Puerto de embarque -observe.common.deployementEnd=Fin de despliegue -observe.common.description=Descripción -observe.common.detectionMode=Modo de detección -observe.common.detectionTime=Heure de détection \#TODO -observe.common.discardHealthness=Salud al rechazo -observe.common.distance=Distancia (m) -observe.common.encounterType=Tipo de encuentro -observe.common.endDate=Fecha de fin -observe.common.endLogValue=Corredera de tarde (millas) -observe.common.endPursingDate=Fecha de fin de calado de la red -observe.common.endPursingTimeStamp=Fecha - Hora de fin de calado de la red -observe.common.endSetDate=Fecha de fin de calado de la red -observe.common.endSetTimeStamp=Fecha - Hora de fin de validez -observe.common.firstName=Número -observe.common.fishingEnd=Fin de pesca -observe.common.fishingStart=Inicio de pesca -observe.common.flagCountry=Bandera -observe.common.fleetCountry=País -observe.common.floatingObjectEmpty=Objeto flotante vacía -observe.common.floatline1Length=Orinque 1 (m) -observe.common.floatline2Length=Orinque 2 (m) -observe.common.floatlinesComposition=Orinques -observe.common.floatlinesCompositionProportionSum=Suma de los proporciónes de los orinques (%) -observe.common.formsUrl=URL de los formularios -observe.common.fpaZone=Zona FPA -observe.common.gaugeLabel=Texto «Capacidad» -observe.common.gear=Equipamiento -observe.common.gearCaracteristicType=Tipo de característica de equipamientos -observe.common.gearType=Tipo de arte de pesca -observe.common.gearUseFeaturesLongline=Equipamiento -observe.common.gearUseFeaturesSeine=Equipamiento -observe.common.gonadeWeight=Peso de las gonadas (g) -observe.common.haulingBreaks=Número de cortes -observe.common.haulingDirectionSameAsSetting=Sentido del arrastre idéntico a lo de la calada -observe.common.haulingEndLatitude=Arrastre Latitud -observe.common.haulingEndLongitude=Arrastre Longitud -observe.common.haulingEndQuadrant=Arrastre Quadrant -observe.common.haulingEndTimeStamp=Timestamp de fin -observe.common.haulingStartLatitude=Arrastre Latitud -observe.common.haulingStartLongitude=Arrastre Longitud -observe.common.haulingStartQuadrant=Arrastre Quadrant -observe.common.haulingStartTimeStamp=Timestamp del inicio -observe.common.hookOffset=Offset anzuelo (°) -observe.common.hookPosition=Posición del anzuelo -observe.common.hookSize=Tamaño -observe.common.hookType=Tipo de anzuelo -observe.common.hooksComposition=Anzuelos -observe.common.hooksCompositionProportionSum=Suma de los proporciónes de anzuelos (%) -observe.common.individualSize=Tamaño (cm) -observe.common.individualWeight=Peso (kg) -observe.common.inputSizeMeasureType=Type de mensuration d'entrée \#TODO -observe.common.iso2Code=Código ISO-2 -observe.common.iso3Code=Código ISO-3 -observe.common.itemHorizontalPosition=Localización del elemento sobre la línea principal -observe.common.itemVerticalPosition=Localización del elemento sobre el arponcillo -observe.common.keelCode=Código de Quilla -observe.common.label1=Texto en inglés -observe.common.label2=Texto en francés -observe.common.label3=Nombre -observe.common.landingHarbour=Puerto de desembarque -observe.common.lastName=Nombre -observe.common.latitude=Latitud -observe.common.length=Longitud eslora total -observe.common.lightsticksColor=Color de barrita de luz -observe.common.lightsticksPerBasketCount=Número de barrita de luz por cesta -observe.common.lightsticksType=Tipo de barrita de luz -observe.common.lineType=Tipo de línea -observe.common.locode=Locode -observe.common.longitude=Longitude -observe.common.maturityStatus=Maturidad -observe.common.maxDepthTargeted=Profundidad máxima deseada -observe.common.maxGearDepth=Profundidad máxima (m) -observe.common.meanLength=Talla media (en cm) -observe.common.meanWeight=Peso medio (en Kg) -observe.common.name=Nombre -observe.common.nextFpaZone=Zona FPA penetrada -observe.common.nonTargetCatch=Fauna accesoria conservada o descartada -observe.common.nonTargetCatchReleaseStatus=État à la libération \#TODO -observe.common.number=Número -observe.common.objectFate=Devenir de objeto -observe.common.objectOperation=Operación sobre la baliza -observe.common.objectType=Tipo de objeto -observe.common.observedSystem=Sistema observado -observe.common.observedSystemDistance=Distancia al sistema observado (millas con 1 decimal) -observe.common.observer=Observador -observe.common.ocean=Océano -observe.common.organism=Organismo -observe.common.outputInputFormula=Formule Sortie vers Entrée \#TODO -observe.common.outputSizeMeasureType=Type de mensuration de sortie \#TODO -observe.common.power=Potencia del motor principal -observe.common.previousFpaZone=La zona FPA de que se salió -observe.common.proportion=Proporción (%) -observe.common.quadrant=Quadrant -observe.common.reasonForDiscard=Razón de descarte -observe.common.reasonForNoFishing=Razón de no pesca Senne -observe.common.reasonForNullSet=Causa de lance nulo -observe.common.releaseTime=Heure de libération \#TODO -observe.common.reportsUrl=URL del informe -observe.common.route=Ruta -observe.common.schoolEstimate=Estimación del banco -observe.common.schoolMeanDepth=Profundidad media (m) -observe.common.schoolThickness=Grossor del banco (m) -observe.common.schoolTopDepth=Profundidad de la cumbre (m) -observe.common.seaSurfaceTemperature=Temperatura en superficie (°) -observe.common.searchMaximum=Velocidad máxima de prospección -observe.common.section=Sección -observe.common.sensorBrand=Marca de sensor -observe.common.sensorDataFormat=Formato de los datos del sensor -observe.common.sensorSerialNo=Número de serie -observe.common.sensorType=Tipo de sensor -observe.common.settingEndLatitude=Calada Latitud -observe.common.settingEndLongitude=Calada longitud -observe.common.settingEndQuadrant=Calada quadrant -observe.common.settingEndTimeStamp=Timestamp de fin -observe.common.settingShape=Forma de la calada -observe.common.settingStartLatitude=Calada Latitud -observe.common.settingStartLongitude=Calada longitud -observe.common.settingStartQuadrant=Calada quadrant -observe.common.settingStartTimeStamp=Timestamp de inicio -observe.common.settingVesselSpeed=Velocidad del barco (nd) -observe.common.shipOwner=Armateur \#TODO -observe.common.shooterSpeed=Velocidad shooter (nd) -observe.common.sizeMeasureType=Tipo de medida -observe.common.snapWeight=Peso snap (kg) -observe.common.species=Especie -observe.common.speciesCatch=Especie -observe.common.speciesFate=Devenir de fauna -observe.common.speciesGroup=Grupo de especie de fauna -observe.common.speciesGroupReleaseMode=Mode de libération \#TODO -observe.common.speciesStatus=Estado de especie -observe.common.speedRange=Texto velocidad del viento -observe.common.startDate=Fecha de comienzo -observe.common.startLogValue=Corredera de mañana (millas) -observe.common.startTime=Fecha - Heuro de inicio de validez -observe.common.status=Estado -observe.common.stomacFullness=Nivel de llenado del estomago -observe.common.supportVesselName=Nombre del macicero -observe.common.surroundingActivity=Actividad circundante -observe.common.swivelWeight=Peso de el destorcedor (kg) -observe.common.targetCatch=Captura de atún -observe.common.time=Hora -observe.common.timeBetweenHooks=Temps entre anzuelos (s) -observe.common.topType=Tipo parte superior -observe.common.totalBasketsCount=Número total de baskets -observe.common.totalCount=Número estimado -observe.common.totalHooksCount=Número total d'arponcillos -observe.common.totalSectionsCount=Número total de secciones -observe.common.totalWeight=Peso -observe.common.tracelineLength=Parte baja (m) -observe.common.tracelineType=Tipo bajo de línea -observe.common.transmittingBuoyOperation=Operación sobre baliza -observe.common.transmittingBuoyType=Tipo de baliza -observe.common.tripType=Tipo de marea -observe.common.type=Type \#TODO -observe.common.uri=URI -observe.common.vessel=Barco -observe.common.vesselActivityLongline=Actividad buque -observe.common.vesselActivitySeine=Actividad buque -observe.common.vesselSizeCategory=Capacidad -observe.common.vesselSpeed=Velocidad del barco (nd) -observe.common.vesselType=Pesquería -observe.common.waveHeight=Texto descriptivo de «altura media de la ola» -observe.common.weight=Peso (en t) -observe.common.weightCategory=Categoría de peso -observe.common.weightLengthFormula=Relación de tallas -observe.common.well=Cuba -observe.common.wind=Fuerza del viento -observe.common.wormsId=Worms -observe.common.yearService=año de entrada en servicio validator.ui.activity.bound.latitude=La latitud dada debe estar comprendida entre %1$s y %2$s. validator.ui.activity.bound.longitude=La longitud dada debe estar comprendida entre %1$s y %2$s. validator.ui.activity.bound.seaSurfaceTemperature=La temperatura debe estar comprendida entre %1$s y %2$s. @@ -314,6 +111,7 @@ validator.ui.floatingObject.required.comment.for.type=Se requiere un comentario validator.ui.floatingObject.required.objectFate=Se recomienda seleccionar un futuro (devenir). validator.ui.floatingObject.required.objectOperation=Es obligatorio seleccionar un operación. validator.ui.floatingObject.required.type=Es obligatorio seleccionar un tipo de objeto. +validator.ui.floatingObject.size.supportVesselName=Support vessel name size can not exceed 1024 characters. \#TODO validator.ui.floatlinesComposition.bound.length=La longitud debe ser entre %s y %s. validator.ui.floatlinesComposition.bound.proportion=La proporción debe ser entre %s y %s. validator.ui.floatlinesComposition.desactivated.lineType=El tipo seleccionado está desactivado. ===================================== application-swing-validation/src/main/resources/i18n/application-swing-validation_fr_FR.properties ===================================== --- a/application-swing-validation/src/main/resources/i18n/application-swing-validation_fr_FR.properties +++ b/application-swing-validation/src/main/resources/i18n/application-swing-validation_fr_FR.properties @@ -1,206 +1,3 @@ -observe.common.activityLongline=Activité -observe.common.activitySeine=Activité -observe.common.baitHaulingStatus=Statut appât au virage -observe.common.baitSettingStatus=Statut appât au filage -observe.common.baitType=Type d'appât -observe.common.baitsComposition=Appâts -observe.common.baitsCompositionProportionSum=Somme des proportions d'appâts (%) -observe.common.basket=Panier -observe.common.basketsPerSectionCount=Nombre de panier par section -observe.common.branchline=Avançon -observe.common.branchlineLength=Longueur Avançon (m) -observe.common.branchlinesComposition=Avançons -observe.common.branchlinesCompositionProportionSum=Somme des proportions d'avançons (%) -observe.common.branchlinesPerBasketCount=Nombre d'hameçons par panier -observe.common.brandName=Marque -observe.common.capacity=Capacité transport (m³) -observe.common.capacityLabel=Libellé capacité -observe.common.captain=Capitaine -observe.common.catchFateLongline=Devenir -observe.common.catchHealthness=Santé à la capture -observe.common.catchWeight=Poids estimé (en t) -observe.common.changeDate=Date changement pavillon -observe.common.code=Identifiant -observe.common.coefficients=Coefficients -observe.common.comment=Commentaire -observe.common.count=Nombre -observe.common.country=Pays -observe.common.currentDirection=Direction du courant (°) -observe.common.currentFpaZone=Zone FPA actuelle -observe.common.currentSpeed=Vitesse du courant (nd) -observe.common.dataEntryOperator=Saisisseur -observe.common.date=Jour d'observation -observe.common.daysAtSeaCount=Nombre de jours à l'eau -observe.common.departureHarbour=Port de départ -observe.common.deployementEnd=Fin déploiement -observe.common.description=Description -observe.common.detectionMode=Mode détection -observe.common.detectionTime=Heure de détection -observe.common.discardHealthness=Santé au rejet -observe.common.distance=Distance (m) -observe.common.encounterType=Type -observe.common.endDate=Fin de validité -observe.common.endLogValue=Loch du soir (milles) -observe.common.endPursingDate=Date de fin coulissage -observe.common.endPursingTimeStamp=Date - Heure de fin coulissage -observe.common.endSetDate=Date fin calée -observe.common.endSetTimeStamp=Date - Heure de fin de validité -observe.common.firstName=Prénom -observe.common.fishingEnd=Fin pêche -observe.common.fishingStart=Début pêche -observe.common.flagCountry=Pavillon -observe.common.fleetCountry=Flotte -observe.common.floatingObjectEmpty=Objet flottant vide -observe.common.floatline1Length=Orin 1 (m) -observe.common.floatline2Length=Orin 2 (m) -observe.common.floatlinesComposition=Orins -observe.common.floatlinesCompositionProportionSum=Somme des proportions d'orins (%) -observe.common.formsUrl=URL des formulaires -observe.common.fpaZone=Zone FPA -observe.common.gaugeLabel=Libellé jauge -observe.common.gear=Equipement -observe.common.gearCaracteristicType=Type de caractéristique -observe.common.gearType=Type d'engin -observe.common.gearUseFeaturesLongline=Équipements -observe.common.gearUseFeaturesSeine=Équipements -observe.common.gonadeWeight=Poids des gonades (g) -observe.common.haulingBreaks=Nombre de coupures -observe.common.haulingDirectionSameAsSetting=Sens du virage identique à celui du filage -observe.common.haulingEndLatitude=Latitude de fin de virage -observe.common.haulingEndLongitude=Longitude de fin de virage -observe.common.haulingEndQuadrant=Quadrant de fin de virage -observe.common.haulingEndTimeStamp=Horodatage fin -observe.common.haulingStartLatitude=Latitude de début de virage -observe.common.haulingStartLongitude=Longitude de début de virage -observe.common.haulingStartQuadrant=Quadrant de début de virage -observe.common.haulingStartTimeStamp=Horodatage début -observe.common.hookOffset=Offset hameçon (°) -observe.common.hookPosition=Position de l'hameçon -observe.common.hookSize=Taille d'hameçon -observe.common.hookType=Type d'hameçon -observe.common.hooksComposition=Hameçons -observe.common.hooksCompositionProportionSum=Somme des proportions d'hameçons (%) -observe.common.individualSize=Taille (cm) -observe.common.individualWeight=Poids (kg) -observe.common.inputSizeMeasureType=Type de mensuration d'entrée -observe.common.iso2Code=code ISO-2 -observe.common.iso3Code=Code ISO-3 -observe.common.itemHorizontalPosition=Position sur la ligne -observe.common.itemVerticalPosition=Position verticale -observe.common.keelCode=Code quille -observe.common.label1=Libellé anglais -observe.common.label2=Libellé français -observe.common.label3=Libellé espagnol -observe.common.landingHarbour=Port d'arrivée -observe.common.lastName=Nom -observe.common.latitude=Latitude -observe.common.length=Longueur hors tout -observe.common.lightsticksColor=Couleur de cyalumes -observe.common.lightsticksPerBasketCount=Nombre de cyalumes par panier -observe.common.lightsticksType=Type de cyalumes -observe.common.lineType=Type de ligne -observe.common.locode=Locode -observe.common.longitude=Longitude -observe.common.maturityStatus=Maturité sexuelle -observe.common.maxDepthTargeted=Profondeur maximum ciblée -observe.common.maxGearDepth=Profondeur maximum (m) -observe.common.meanLength=Taille moyenne (en cm) -observe.common.meanWeight=Poids moyen (en Kg) -observe.common.name=Nom -observe.common.nextFpaZone=Zone FPA pénétrée -observe.common.nonTargetCatch=Faune accessoire conservée ou rejetée -observe.common.nonTargetCatchReleaseStatus=État à la libération -observe.common.number=Nombre -observe.common.objectFate=Devenir de l'objet -observe.common.objectOperation=Opération sur l'objet -observe.common.objectType=Type d'objet -observe.common.observedSystem=Système observé -observe.common.observedSystemDistance=Distance système observé (en milles avec 1 décimale) -observe.common.observer=Observateur -observe.common.ocean=Océan -observe.common.organism=Organisme -observe.common.outputInputFormula=Formule sortie -> entrée -observe.common.outputSizeMeasureType=Type de mensuration de sortie -observe.common.power=Puissance moteur principal -observe.common.previousFpaZone=Zone FPA quittée -observe.common.proportion=Proportion (%) -observe.common.quadrant=Quadrant -observe.common.reasonForDiscard=Raison rejet -observe.common.reasonForNoFishing=Raison de non coup de Senne -observe.common.reasonForNullSet=Cause coup nul -observe.common.releaseTime=Heure de libération -observe.common.reportsUrl=URL de rapport -observe.common.route=Route -observe.common.schoolEstimate=Estimation banc -observe.common.schoolMeanDepth=Profondeur moyenne (m) -observe.common.schoolThickness=Épaisseur du banc (m) -observe.common.schoolTopDepth=Profondeur sommet (m) -observe.common.seaSurfaceTemperature=Température surface (°) -observe.common.searchMaximum=Vitesse maximale -observe.common.section=Section -observe.common.sensorBrand=Marque -observe.common.sensorDataFormat=Format de données -observe.common.sensorSerialNo=Numéro de série -observe.common.sensorType=Type -observe.common.settingEndLatitude=Latitude de fin de filage -observe.common.settingEndLongitude=Longitude de fin de filage -observe.common.settingEndQuadrant=Quadrant de fin de filage -observe.common.settingEndTimeStamp=Horodatage fin -observe.common.settingShape=Forme du filage -observe.common.settingStartLatitude=Latitude de début de filage -observe.common.settingStartLongitude=Longitude de début de filage -observe.common.settingStartQuadrant=Quadrant de début de filage -observe.common.settingStartTimeStamp=Horodatage début -observe.common.settingVesselSpeed=Vitesse bateau (nd) -observe.common.shipOwner=Armateur -observe.common.shooterSpeed=Vitesse shooter (nd) -observe.common.sizeMeasureType=Type de mensuration -observe.common.snapWeight=Poids snap (kg) -observe.common.species=Espèce -observe.common.speciesCatch=Espèce -observe.common.speciesFate=Devenir espèce -observe.common.speciesGroup=Groupe espèce -observe.common.speciesGroupReleaseMode=Mode de libération -observe.common.speciesStatus=Statut faune observée -observe.common.speedRange=Libellé vitesse vent -observe.common.startDate=Début de validité -observe.common.startLogValue=Loch du matin (milles) -observe.common.startTime=Date - Heure de début de validité -observe.common.status=Statut -observe.common.stomacFullness=État de l'estomac -observe.common.supportVesselName=Nom supply -observe.common.surroundingActivity=Activité environnante -observe.common.swivelWeight=Poids de l'émerillon (kg) -observe.common.targetCatch=Capture cible -observe.common.time=Heure -observe.common.timeBetweenHooks=Temps entre hameçons (s) -observe.common.topType=Type -observe.common.totalBasketsCount=Nombre de paniers -observe.common.totalCount=Nombre estimé -observe.common.totalHooksCount=Nombre total d'avançons -observe.common.totalSectionsCount=Nombre total de sections -observe.common.totalWeight=Poids -observe.common.tracelineLength=Partie basse (m) -observe.common.tracelineType=Type bas de ligne -observe.common.transmittingBuoyOperation=Opération balise -observe.common.transmittingBuoyType=Type de balise -observe.common.tripType=Type de marée -observe.common.type=Type -observe.common.uri=URI -observe.common.vessel=Bateau -observe.common.vesselActivityLongline=Activité bateau -observe.common.vesselActivitySeine=Activité bateau -observe.common.vesselSizeCategory=Catégorie de bateau -observe.common.vesselSpeed=Vitesse bateau (nd) -observe.common.vesselType=Type de pêcherie -observe.common.waveHeight=Libellé Hauteur moyenne vagues -observe.common.weight=Poids (en t) -observe.common.weightCategory=Catégorie de poids -observe.common.weightLengthFormula=Relation Taille -observe.common.well=Cuve -observe.common.wind=Vent Beaufort -observe.common.wormsId=Worms -observe.common.yearService=Année de mise en service validator.ui.activity.bound.latitude=La latitude doit être comprise entre %1$s et %2$s. validator.ui.activity.bound.longitude=La longitude doit être comprise entre %1$s et %2$s. validator.ui.activity.bound.seaSurfaceTemperature=La température doit être comprise entre %1$s et %2$s. @@ -314,6 +111,7 @@ validator.ui.floatingObject.required.comment.for.type=Un commentaire est requis validator.ui.floatingObject.required.objectFate=La sélection d'un devenir d'objet est conseillée. validator.ui.floatingObject.required.objectOperation=La sélection d'une opération d'objet est obligatoire. validator.ui.floatingObject.required.type=La sélection d'un type d'objet est obligatoire. +validator.ui.floatingObject.size.supportVesselName=La taille du nom supply est limitée à 1024 caractères. validator.ui.floatlinesComposition.bound.length=La longueur doit être comprise entre %s et %s. validator.ui.floatlinesComposition.bound.proportion=La proportion doit être comprise entre %s et %s. validator.ui.floatlinesComposition.desactivated.lineType=Le type sélectionnée est désactivée. ===================================== services-runner/pom.xml ===================================== --- a/services-runner/pom.xml +++ b/services-runner/pom.xml @@ -21,7 +21,8 @@ #L% --> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> @@ -110,6 +111,13 @@ <scope>test</scope> </dependency> + <dependency> + <groupId>io.ultreia.java4all.i18n</groupId> + <artifactId>i18n-api</artifactId> + <version>${nuitonI18nVersion}</version> + <scope>test</scope> + </dependency> + <!-- test dependencies --> <dependency> @@ -118,4 +126,95 @@ </dependency> </dependencies> + + <build> + + <resources> + <resource> + <directory>${project.basedir}/src/main/resources</directory> + <excludes> + <exclude>i18n/**</exclude> + </excludes> + </resource> + </resources> + <plugins> + <plugin> + <groupId>${project.groupId}</groupId> + <artifactId>toolbox-maven-plugin</artifactId> + <version>${project.version}</version> + <executions> + <execution> + <id>generate-i18n-validator-fields-for-service</id> + <goals> + <goal>generate-i18n-validator-fields</goal> + </goals> + <phase>generate-sources</phase> + <configuration> + <className>ServiceI18nValidatorHelper</className> + <prefix>observe.common.</prefix> + <validatorsFile>${project.basedir}/main/resources/validators.xml</validatorsFile> + <sourceRoot>${project.parent.basedir}/services-validation/src/main/resources</sourceRoot> + </configuration> + </execution> + <execution> + <id>generate-i18n-validator-fields-for-swing</id> + <goals> + <goal>generate-i18n-validator-fields</goal> + </goals> + <phase>generate-sources</phase> + <configuration> + <className>ApplicationSwingI18nValidatorHelper</className> + <prefix>observe.common.</prefix> + <validatorsFile>${project.basedir}/main/resources/validators.xml</validatorsFile> + <sourceRoot>${project.parent.basedir}/application-swing-validation/src/main/resources</sourceRoot> + </configuration> + </execution> + </executions> + <dependencies> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>persistence</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>services-validation</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>application-swing-validation</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>io.ultreia.java4all.i18n</groupId> + <artifactId>i18n-api</artifactId> + <version>${nuitonI18nVersion}</version> + </dependency> + </dependencies> + </plugin> + + <plugin> + <groupId>io.ultreia.java4all.i18n</groupId> + <artifactId>i18n-maven-plugin</artifactId> + <executions> + <execution> + <id>scan-sources</id> + <goals> + <goal>parserJava</goal> + <goal>gen</goal> + </goals> + <configuration> + <entries> + <entry> + <basedir>${project.build.directory}/generated-sources/java/</basedir> + </entry> + </entries> + </configuration> + </execution> + </executions> + </plugin> + + </plugins> + </build> </project> ===================================== services-runner/src/main/resources/i18n/services-runner_en_GB.properties ===================================== --- /dev/null +++ b/services-runner/src/main/resources/i18n/services-runner_en_GB.properties ===================================== services-runner/src/main/resources/i18n/services-runner_es_ES.properties ===================================== --- /dev/null +++ b/services-runner/src/main/resources/i18n/services-runner_es_ES.properties ===================================== services-runner/src/main/resources/i18n/services-runner_fr_FR.properties ===================================== --- /dev/null +++ b/services-runner/src/main/resources/i18n/services-runner_fr_FR.properties ===================================== services-validation/pom.xml ===================================== --- a/services-validation/pom.xml +++ b/services-validation/pom.xml @@ -78,10 +78,6 @@ <artifactId>nuiton-utils</artifactId> </dependency> <dependency> - <groupId>io.ultreia.java4all.i18n</groupId> - <artifactId>i18n-api</artifactId> - </dependency> - <dependency> <groupId>org.nuiton.topia</groupId> <artifactId>topia-persistence</artifactId> </dependency> @@ -131,15 +127,6 @@ </configuration> <executions> <execution> - <id>generate-i18n-validator-fields</id> - <goals> - <goal>generate-i18n-validator-fields</goal> - </goals> - <configuration> - <prefix>observe.common.</prefix> - </configuration> - </execution> - <execution> <id>generate-validators-descriptor</id> <goals> <goal>generate-validators-descriptor</goal> @@ -159,46 +146,18 @@ </dependency> </dependencies> </plugin> - - <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <executions> - <execution> - <id>compile-generated-sources</id> - <goals> - <goal>compile</goal> - </goals> - <phase>process-classes</phase> - <configuration> - <includes> - <include>**/I18nValidatorHelper.java</include> - </includes> - </configuration> - </execution> - </executions> - </plugin> <plugin> <groupId>io.ultreia.java4all.i18n</groupId> <artifactId>i18n-maven-plugin</artifactId> <executions> <execution> <id>parse-java</id> - <phase>process-classes</phase> <goals> <goal>parserJava</goal> </goals> - <configuration> - <entries> - <entry> - <specificGoal>parserJava</specificGoal> - <basedir>${project.build.directory}/generated-sources/java</basedir> - </entry> - </entries> - </configuration> </execution> <execution> <id>parse-validation</id> - <phase>process-classes</phase> <goals> <goal>parserValidation</goal> </goals> @@ -215,12 +174,18 @@ </execution> <execution> <id>gen</id> - <phase>process-classes</phase> <goals> <goal>gen</goal> </goals> </execution> </executions> + <dependencies> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>services</artifactId> + <version>${project.version}</version> + </dependency> + </dependencies> </plugin> </plugins> ===================================== services-validation/src/main/resources/i18n/services-validation_en_GB.properties ===================================== --- a/services-validation/src/main/resources/i18n/services-validation_en_GB.properties +++ b/services-validation/src/main/resources/i18n/services-validation_en_GB.properties @@ -1,207 +1,3 @@ -observe.common.activitySeine=Activity -observe.common.baitHaulingStatus=Bait hauling status -observe.common.baitSettingStatus=Bait setting status -observe.common.baitType=Bait type -observe.common.baitsComposition=Baits composition -observe.common.baitsCompositionProportionSum=Baits composition proportion sum -observe.common.basket=Basket -observe.common.basketsPerSectionCount=Basket per section count -observe.common.branchline=Branchline -observe.common.branchlineLength=Branchline length -observe.common.branchlinesComposition=Branchlines composition -observe.common.branchlinesCompositionProportionSum=Branchlines composition proportion sum -observe.common.branchlinesPerBasketCount=Branchlines per basket count -observe.common.brandName=Brand name -observe.common.capacity=Capacity -observe.common.capacityLabel=Capacity label -observe.common.captain=Captain -observe.common.catchFateLongline=Catch fate -observe.common.catchHealthness=Catch healthness -observe.common.catchWeight=Catch weight -observe.common.changeDate=Change date -observe.common.code=Code -observe.common.coefficients=Coefficients -observe.common.comment=Comment -observe.common.count=Count -observe.common.country=Country -observe.common.currentDirection=Current direction -observe.common.currentSpeed=Current speed -observe.common.dataEntryOperator=Data entry operator -observe.common.date=Date -observe.common.daysAtSeaCount=Days at sea count -observe.common.departureHarbour=Departure harbour -observe.common.deployementEnd=Deployement end -observe.common.description=Description -observe.common.detectionMode=Detection mode -observe.common.detectionTime=Detection time -observe.common.discardHealthness=Discard healthness -observe.common.distance=Distance -observe.common.encounterType=Encounter type -observe.common.endDate=End date -observe.common.endLogValue=End log value -observe.common.endPursingDate=End pursing date -observe.common.endPursingTimeStamp=End pursing timestamp -observe.common.endSetDate=End set date -observe.common.endSetTimeStamp=End set timestamp -observe.common.faoCode=Fao code -observe.common.firstName=First name -observe.common.fishingEnd=Fishing end -observe.common.fishingStart=Fishing start -observe.common.flagCountry=Flag country -observe.common.fleetCountry=Fleet country -observe.common.floatingObject=Floating object -observe.common.floatline1Length=floatline 1 length -observe.common.floatline2Length=floatline 2 length -observe.common.floatlinesComposition=floatlines composition -observe.common.floatlinesCompositionProportionSum=floatlines composition proportion sum -observe.common.formsUrl=Forms url -observe.common.fpaZone=Fpa zone -observe.common.gaugeLabel=Gauge label -observe.common.gear=Gear -observe.common.gearCaracteristicType=Gear caracteristic type -observe.common.gearUseFeaturesSeine=Gear use features -observe.common.gonadeWeight=Gonade weight -observe.common.haulingBreaks=Hauling breaks -observe.common.haulingDirectionSameAsSetting=Hauling direction same as setting -observe.common.haulingEndLatitude=Hauling end latitude -observe.common.haulingEndLongitude=Hauling end longitude -observe.common.haulingEndQuadrant=Hauling end quadrant -observe.common.haulingEndTimeStamp=Hauling end timeStamp -observe.common.haulingStartLatitude=Hauling start latitude -observe.common.haulingStartLongitude=Hauling start longitude -observe.common.haulingStartQuadrant=Hauling start quadrant -observe.common.haulingStartTimeStamp=Hauling start timeStamp -observe.common.homeId=Home id -observe.common.hookOffset=Hook offset -observe.common.hookPosition=Hook position -observe.common.hookSize=Hook size -observe.common.hookType=Hook type -observe.common.hooksComposition=hooks composition -observe.common.hooksCompositionProportionSum=hooks composition proportion sum -observe.common.individualSize=Individual size -observe.common.individualWeight=Individual weight -observe.common.inputOutputFormula=Input to Output formula -observe.common.iso2Code=Iso 2 code -observe.common.iso3Code=Iso 3 code -observe.common.itemHorizontalPosition=Item horizontal position -observe.common.itemVerticalPosition=Item vertical position -observe.common.keelCode=Keel code -observe.common.label=Label -observe.common.label1=English label -observe.common.label2=French label -observe.common.label3=Spanish label -observe.common.landingHarbour=Landing harbour -observe.common.lastName=Last name -observe.common.latitude=Latitude -observe.common.length=Length -observe.common.lengthWeightFormula=Length weight formula -observe.common.lightsticksColor=Lightsticks color -observe.common.lightsticksPerBasketCount=Lightsticks per basket count -observe.common.lightsticksType=Lightsticks type -observe.common.lineType=Line type -observe.common.locode=Locode -observe.common.longitude=Longitude -observe.common.maturityStatus=Maturity status -observe.common.maxDepthTargeted=Max depth targeted -observe.common.maxGearDepth=Max gear depth -observe.common.meanLength=Mean length -observe.common.meanWeight=Mean weight -observe.common.name=Name -observe.common.nonTargetCatch=Non target catch -observe.common.nonTargetCatchReleaseStatusType=Release state -observe.common.number=Number -observe.common.objectFate=Object fate -observe.common.objectMaterialType=Type -observe.common.objectOperation=Object operation -observe.common.objectType=Object type -observe.common.observedSystem=Observed system -observe.common.observedSystemDistance=Observed system distance -observe.common.observer=Observed -observe.common.ocean=Ocean -observe.common.organism=Organism -observe.common.outputInputFormula=Output to Input formula -observe.common.power=Power -observe.common.proportion=Proportion -observe.common.quadrant=Quadrant -observe.common.reasonForDiscard=Reason for discad -observe.common.reasonForNoFishing=Reason for no fishing -observe.common.reasonForNullSet=Reason for null set -observe.common.releaseTime=Release time -observe.common.reportsUrl=Reports url -observe.common.route=Route -observe.common.schoolEstimate=School estimate -observe.common.schoolMeanDepth=School mean depth -observe.common.schoolThickness=School thickness -observe.common.schoolTopDepth=School top depth -observe.common.scientificLabel=Scientific label -observe.common.seaSurfaceTemperature=Sea surface temperature -observe.common.searchMaximum=Search maximum -observe.common.section=Section -observe.common.sensorBrand=Sensor brand -observe.common.sensorDataFormat=Sensor data format -observe.common.sensorSerialNo=Sensor serial no -observe.common.sensorType=Sensor type -observe.common.settingEndLatitude=Setting end latitude -observe.common.settingEndLongitude=Setting end longitude -observe.common.settingEndQuadrant=Setting end quadrant -observe.common.settingEndTimeStamp=Setting end timeStamp -observe.common.settingIdentifier=Setting -observe.common.settingShape=Setting shape -observe.common.settingStartLatitude=Setting start latitude -observe.common.settingStartLongitude=Setting start longitude -observe.common.settingStartQuadrant=Setting start quadrant -observe.common.settingStartTimeStamp=Setting start timeStamp -observe.common.settingVesselSpeed=Setting vessel speed -observe.common.sex=Sex -observe.common.shipOwner=Ship owner -observe.common.shooterSpeed=Shooter speed -observe.common.sizeMeasureType=Size measure type -observe.common.snapWeight=Snap weight -observe.common.species=Species -observe.common.speciesCatch=Species -observe.common.speciesFate=Species fate -observe.common.speciesGroup=Species group -observe.common.speciesGroupReleaseMode=Release mode -observe.common.speciesGroupReleaseStatus=Release state -observe.common.speciesStatus=Species status -observe.common.speedRange=Speed range -observe.common.startDate=Start date -observe.common.startLogValue=Start log value -observe.common.startTime=Sart time -observe.common.status=Status -observe.common.stomacFullness=Stomac fullness -observe.common.supportVesselName=Support vessel name -observe.common.surroundingActivity=Surrounding activity -observe.common.swivelWeight=Swivel weight -observe.common.targetCatch=Target catch -observe.common.time=Time -observe.common.timeBetweenHooks=Time between hooks -observe.common.topType=Top type -observe.common.totalBasketsCount=Total baskets count -observe.common.totalCount=Count -observe.common.totalHooksCount=Total hooks count -observe.common.totalSectionsCount=Total section count -observe.common.totalWeight=Total weight -observe.common.tracelineLength=Traceline length -observe.common.tracelineType=Traceline type -observe.common.transmittingBuoyOperation=Transmitting buoy operation -observe.common.transmittingBuoyType=Transmitting buoy type -observe.common.tripType=Trip type -observe.common.type=Type -observe.common.uri=Uri -observe.common.vessel=Boat -observe.common.vesselActivityLongline=Vessel activity -observe.common.vesselSizeCategory=Vessel size category -observe.common.vesselSpeed=Vessel spped -observe.common.vesselType=Vessel type -observe.common.waveHeight=Wave weight -observe.common.weight=Weight -observe.common.weightCategory=Weight category -observe.common.weightLengthFormula=Weight length formula -observe.common.well=Well -observe.common.wind=Wind -observe.common.wormsId=Worms id -observe.common.yearService=Year service validator.service.activity.bound.latitude=Latitude must be between %1$s and %2$s. validator.service.activity.bound.longitude=Longitude must be between %1$s and %2$s. validator.service.activity.bound.seaSurfaceTemperature=Temperature must be between %1$s and %2$s. @@ -305,6 +101,7 @@ validator.service.floatingObject.required.comment.for.type=A comment is required validator.service.floatingObject.required.objectFate=Object fate must be filled. validator.service.floatingObject.required.objectOperation=Object operation must be filled. validator.service.floatingObject.required.type=Type must be filled. +validator.service.floatingObject.size.supportVesselName=Support vessel name size can not exceed 1024 characters. validator.service.floatlinesComposition.bound.length=Length must be between %1$s and %2$s. validator.service.floatlinesComposition.bound.proportion=Proportion must be between %1$s and %2$s. validator.service.floatlinesComposition.desactivated.lineType=Selected line type is disabled. ===================================== services-validation/src/main/resources/i18n/services-validation_es_ES.properties ===================================== --- a/services-validation/src/main/resources/i18n/services-validation_es_ES.properties +++ b/services-validation/src/main/resources/i18n/services-validation_es_ES.properties @@ -1,207 +1,3 @@ -observe.common.activitySeine=Actividad -observe.common.baitHaulingStatus=Estatuto del cebo en el arrastre -observe.common.baitSettingStatus=Estatuto del cebo en la calada -observe.common.baitType=Tipo de cebo -observe.common.baitsComposition=Cebo -observe.common.baitsCompositionProportionSum=Suma de los proporciónes de cebo (%) -observe.common.basket=Cesta -observe.common.basketsPerSectionCount=Número de cestas por sección -observe.common.branchline=Arponcillo -observe.common.branchlineLength=Arponcillo (m) -observe.common.branchlinesComposition=Arponcillos -observe.common.branchlinesCompositionProportionSum=Suma de los proporciónes de arponcillos (%) -observe.common.branchlinesPerBasketCount=Número de anzuelos por cesta -observe.common.brandName=Marca -observe.common.capacity=Capacidad de transporte -observe.common.capacityLabel=Texto capacidad -observe.common.captain=Patrón -observe.common.catchFateLongline=Futuro de la captura -observe.common.catchHealthness=Salud a la captura -observe.common.catchWeight=Peso estimado (en t) -observe.common.changeDate=Fecha de carga -observe.common.code=Identificación -observe.common.coefficients=Coeficientes -observe.common.comment=Comentarios -observe.common.count=Número -observe.common.country=País -observe.common.currentDirection=Direction du courant (°) -observe.common.currentSpeed=Velocidad del corriente (nd) -observe.common.dataEntryOperator=Operador de captación de datos -observe.common.date=Día de observación -observe.common.daysAtSeaCount=Numero de días en el mar -observe.common.departureHarbour=Puerto de embarque -observe.common.deployementEnd=Fin de despliegue -observe.common.description=Descripción -observe.common.detectionMode=Modo de detección -observe.common.detectionTime=Heure de détection \#TODO -observe.common.discardHealthness=Salud al rechazo -observe.common.distance=Distancia (m) -observe.common.encounterType=Tipo de encuentro -observe.common.endDate=Fecha de fin -observe.common.endLogValue=Corredera de tarde (millas) -observe.common.endPursingDate=Fecha de fin de calado de la red -observe.common.endPursingTimeStamp=Fecha - Hora de fin de calado de la red -observe.common.endSetDate=Fecha de fin de calado de la red -observe.common.endSetTimeStamp=Fecha - Hora de fin de validez -observe.common.faoCode=Codigo FAO -observe.common.firstName=Número -observe.common.fishingEnd=Fin de pesca -observe.common.fishingStart=Inicio de pesca -observe.common.flagCountry=Bandera -observe.common.fleetCountry=País -observe.common.floatingObject=Objeto flotante -observe.common.floatline1Length=Orinque 1 (m) -observe.common.floatline2Length=Orinque 2 (m) -observe.common.floatlinesComposition=Orinques -observe.common.floatlinesCompositionProportionSum=Suma de los proporciónes de los orinques (%) -observe.common.formsUrl=URL de los formularios -observe.common.fpaZone=Zona FPA -observe.common.gaugeLabel=Texto «Capacidad» -observe.common.gear=Equipamiento -observe.common.gearCaracteristicType=Tipo de característica de equipamientos -observe.common.gearUseFeaturesSeine=Equipamiento -observe.common.gonadeWeight=Peso de las gonadas (g) -observe.common.haulingBreaks=Número de cortes -observe.common.haulingDirectionSameAsSetting=Sentido del arrastre idéntico a lo de la calada -observe.common.haulingEndLatitude=Arrastre Latitud -observe.common.haulingEndLongitude=Arrastre Longitud -observe.common.haulingEndQuadrant=Arrastre Quadrant -observe.common.haulingEndTimeStamp=Timestamp de fin -observe.common.haulingStartLatitude=Arrastre Latitud -observe.common.haulingStartLongitude=Arrastre Longitud -observe.common.haulingStartQuadrant=Arrastre Quadrant -observe.common.haulingStartTimeStamp=Timestamp del inicio -observe.common.homeId=Identificador -observe.common.hookOffset=Offset anzuelo (°) -observe.common.hookPosition=Posición del anzuelo -observe.common.hookSize=Tamaño -observe.common.hookType=Tipo de anzuelo -observe.common.hooksComposition=Anzuelos -observe.common.hooksCompositionProportionSum=Suma de los proporciónes de anzuelos (%) -observe.common.individualSize=Tamaño (cm) -observe.common.individualWeight=Peso (kg) -observe.common.inputOutputFormula=Formule Entrée vers Sortie \#TODO -observe.common.iso2Code=Código ISO-2 -observe.common.iso3Code=Código ISO-3 -observe.common.itemHorizontalPosition=Localización del elemento sobre la línea principal -observe.common.itemVerticalPosition=Localización del elemento sobre el arponcillo -observe.common.keelCode=Código de Quilla -observe.common.label=Texto -observe.common.label1=Texto en inglés -observe.common.label2=Texto en francés -observe.common.label3=Nombre -observe.common.landingHarbour=Puerto de desembarque -observe.common.lastName=Nombre -observe.common.latitude=Latitud -observe.common.length=Longitud eslora total -observe.common.lengthWeightFormula=Relación de peso -observe.common.lightsticksColor=Color de barrita de luz -observe.common.lightsticksPerBasketCount=Número de barrita de luz por cesta -observe.common.lightsticksType=Tipo de barrita de luz -observe.common.lineType=Tipo de línea -observe.common.locode=Locode -observe.common.longitude=Longitude -observe.common.maturityStatus=Maturidad -observe.common.maxDepthTargeted=Profundidad máxima deseada -observe.common.maxGearDepth=Profundidad máxima (m) -observe.common.meanLength=Talla media (en cm) -observe.common.meanWeight=Peso medio (en Kg) -observe.common.name=Nombre -observe.common.nonTargetCatch=Fauna accesoria conservada o descartada -observe.common.nonTargetCatchReleaseStatusType=État à la libération \#TODO -observe.common.number=Número -observe.common.objectFate=Devenir de objeto -observe.common.objectMaterialType=Type \#TODO -observe.common.objectOperation=Operación sobre la baliza -observe.common.objectType=Tipo de objeto -observe.common.observedSystem=Sistema observado -observe.common.observedSystemDistance=Distancia al sistema observado (millas con 1 decimal) -observe.common.observer=Observador -observe.common.ocean=Océano -observe.common.organism=Organismo -observe.common.outputInputFormula=Formule Sortie vers Entrée \#TODO -observe.common.power=Potencia del motor principal -observe.common.proportion=Proporción (%) -observe.common.quadrant=Quadrant -observe.common.reasonForDiscard=Razón de descarte -observe.common.reasonForNoFishing=Razón de no pesca Senne -observe.common.reasonForNullSet=Causa de lance nulo -observe.common.releaseTime=Heure de libération \#TODO -observe.common.reportsUrl=URL del informe -observe.common.route=Ruta -observe.common.schoolEstimate=Estimación del banco -observe.common.schoolMeanDepth=Profundidad media (m) -observe.common.schoolThickness=Grossor del banco (m) -observe.common.schoolTopDepth=Profundidad de la cumbre (m) -observe.common.scientificLabel=Texto científico -observe.common.seaSurfaceTemperature=Temperatura en superficie (°) -observe.common.searchMaximum=Velocidad máxima de prospección -observe.common.section=Sección -observe.common.sensorBrand=Marca de sensor -observe.common.sensorDataFormat=Formato de los datos del sensor -observe.common.sensorSerialNo=Número de serie -observe.common.sensorType=Tipo de sensor -observe.common.settingEndLatitude=Calada Latitud -observe.common.settingEndLongitude=Calada longitud -observe.common.settingEndQuadrant=Calada quadrant -observe.common.settingEndTimeStamp=Timestamp de fin -observe.common.settingIdentifier=Calada -observe.common.settingShape=Forma de la calada -observe.common.settingStartLatitude=Calada Latitud -observe.common.settingStartLongitude=Calada longitud -observe.common.settingStartQuadrant=Calada quadrant -observe.common.settingStartTimeStamp=Timestamp de inicio -observe.common.settingVesselSpeed=Velocidad del barco (nd) -observe.common.sex=Sexo -observe.common.shipOwner=Armateur \#TODO -observe.common.shooterSpeed=Velocidad shooter (nd) -observe.common.sizeMeasureType=Tipo de medida -observe.common.snapWeight=Peso snap (kg) -observe.common.species=Especie -observe.common.speciesCatch=Especie -observe.common.speciesFate=Devenir de fauna -observe.common.speciesGroup=Grupo de especie de fauna -observe.common.speciesGroupReleaseMode=Mode de libération \#TODO -observe.common.speciesGroupReleaseStatus=État à la libération \#TODO -observe.common.speciesStatus=Estado de especie -observe.common.speedRange=Texto velocidad del viento -observe.common.startDate=Fecha de comienzo -observe.common.startLogValue=Corredera de mañana (millas) -observe.common.startTime=Fecha - Heuro de inicio de validez -observe.common.status=Estado -observe.common.stomacFullness=Nivel de llenado del estomago -observe.common.supportVesselName=Nombre del macicero -observe.common.surroundingActivity=Actividad circundante -observe.common.swivelWeight=Peso de el destorcedor (kg) -observe.common.targetCatch=Captura de atún -observe.common.time=Hora -observe.common.timeBetweenHooks=Temps entre anzuelos (s) -observe.common.topType=Tipo parte superior -observe.common.totalBasketsCount=Número total de baskets -observe.common.totalCount=Número estimado -observe.common.totalHooksCount=Número total d'arponcillos -observe.common.totalSectionsCount=Número total de secciones -observe.common.totalWeight=Peso -observe.common.tracelineLength=Parte baja (m) -observe.common.tracelineType=Tipo bajo de línea -observe.common.transmittingBuoyOperation=Operación sobre baliza -observe.common.transmittingBuoyType=Tipo de baliza -observe.common.tripType=Tipo de marea -observe.common.type=Type \#TODO -observe.common.uri=URI -observe.common.vessel=Barco -observe.common.vesselActivityLongline=Actividad buque -observe.common.vesselSizeCategory=Capacidad -observe.common.vesselSpeed=Velocidad del barco (nd) -observe.common.vesselType=Pesquería -observe.common.waveHeight=Texto descriptivo de «altura media de la ola» -observe.common.weight=Peso (en t) -observe.common.weightCategory=Categoría de peso -observe.common.weightLengthFormula=Relación de tallas -observe.common.well=Cuba -observe.common.wind=Fuerza del viento -observe.common.wormsId=Worms -observe.common.yearService=año de entrada en servicio validator.service.activity.bound.latitude=La latitud dada debe estar comprendida entre %1$s y %2$s. validator.service.activity.bound.longitude=La longitud dada debe estar comprendida entre %1$s y %2$s. validator.service.activity.bound.seaSurfaceTemperature=La temperatura debe estar comprendida entre %1$s y %2$s. @@ -305,6 +101,7 @@ validator.service.floatingObject.required.comment.for.type=Se requiere un coment validator.service.floatingObject.required.objectFate=Se recomienda seleccionar un futuro (devenir). validator.service.floatingObject.required.objectOperation=Es obligatorio seleccionar un operación. validator.service.floatingObject.required.type=Es obligatorio seleccionar un tipo de objeto. +validator.service.floatingObject.size.supportVesselName=Support vessel name size can not exceed 1024 characters. \#TODO validator.service.floatlinesComposition.bound.length=La longitud debe ser entre %s y %s. validator.service.floatlinesComposition.bound.proportion=La proporción debe ser entre %s y %s. validator.service.floatlinesComposition.desactivated.lineType=El tipo seleccionado está desactivado. ===================================== services-validation/src/main/resources/i18n/services-validation_fr_FR.properties ===================================== --- a/services-validation/src/main/resources/i18n/services-validation_fr_FR.properties +++ b/services-validation/src/main/resources/i18n/services-validation_fr_FR.properties @@ -1,207 +1,3 @@ -observe.common.activitySeine=Activité -observe.common.baitHaulingStatus=Statut appât au virage -observe.common.baitSettingStatus=Statut appât au filage -observe.common.baitType=Type d'appât -observe.common.baitsComposition=Appâts -observe.common.baitsCompositionProportionSum=Somme des proportions d'appâts (%) -observe.common.basket=Panier -observe.common.basketsPerSectionCount=Nombre de panier par section -observe.common.branchline=Avançon -observe.common.branchlineLength=Longueur Avançon (m) -observe.common.branchlinesComposition=Avançons -observe.common.branchlinesCompositionProportionSum=Somme des proportions d'avançons (%) -observe.common.branchlinesPerBasketCount=Nombre d'hameçons par panier -observe.common.brandName=Marque -observe.common.capacity=Capacité transport (m³) -observe.common.capacityLabel=Libellé capacité -observe.common.captain=Capitaine -observe.common.catchFateLongline=Devenir -observe.common.catchHealthness=Santé à la capture -observe.common.catchWeight=Poids estimé (en t) -observe.common.changeDate=Date changement pavillon -observe.common.code=Identifiant -observe.common.coefficients=Coefficients -observe.common.comment=Commentaire -observe.common.count=Nombre -observe.common.country=Pays -observe.common.currentDirection=Direction du courant (°) -observe.common.currentSpeed=Vitesse du courant (nd) -observe.common.dataEntryOperator=Saisisseur -observe.common.date=Jour d'observation -observe.common.daysAtSeaCount=Nombre de jours à l'eau -observe.common.departureHarbour=Port de départ -observe.common.deployementEnd=Fin déploiement -observe.common.description=Description -observe.common.detectionMode=Mode détection -observe.common.detectionTime=Heure de détection -observe.common.discardHealthness=Santé au rejet -observe.common.distance=Distance (m) -observe.common.encounterType=Type -observe.common.endDate=Fin de validité -observe.common.endLogValue=Loch du soir (milles) -observe.common.endPursingDate=Date de fin coulissage -observe.common.endPursingTimeStamp=Date - Heure de fin coulissage -observe.common.endSetDate=Date fin calée -observe.common.endSetTimeStamp=Date - Heure de fin de validité -observe.common.faoCode=Code FAO -observe.common.firstName=Prénom -observe.common.fishingEnd=Fin pêche -observe.common.fishingStart=Début pêche -observe.common.flagCountry=Pavillon -observe.common.fleetCountry=Flotte -observe.common.floatingObject=Objet flottant -observe.common.floatline1Length=Orin 1 (m) -observe.common.floatline2Length=Orin 2 (m) -observe.common.floatlinesComposition=Orins -observe.common.floatlinesCompositionProportionSum=Somme des proportions d'orins (%) -observe.common.formsUrl=URL des formulaires -observe.common.fpaZone=Zone FPA -observe.common.gaugeLabel=Libellé jauge -observe.common.gear=Equipement -observe.common.gearCaracteristicType=Type de caractéristique -observe.common.gearUseFeaturesSeine=Équipements -observe.common.gonadeWeight=Poids des gonades (g) -observe.common.haulingBreaks=Nombre de coupures -observe.common.haulingDirectionSameAsSetting=Sens du virage identique à celui du filage -observe.common.haulingEndLatitude=Latitude de fin de virage -observe.common.haulingEndLongitude=Longitude de fin de virage -observe.common.haulingEndQuadrant=Quadrant de fin de virage -observe.common.haulingEndTimeStamp=Horodatage fin -observe.common.haulingStartLatitude=Latitude de début de virage -observe.common.haulingStartLongitude=Longitude de début de virage -observe.common.haulingStartQuadrant=Quadrant de début de virage -observe.common.haulingStartTimeStamp=Horodatage début -observe.common.homeId=Identifiant -observe.common.hookOffset=Offset hameçon (°) -observe.common.hookPosition=Position de l'hameçon -observe.common.hookSize=Taille d'hameçon -observe.common.hookType=Type d'hameçon -observe.common.hooksComposition=Hameçons -observe.common.hooksCompositionProportionSum=Somme des proportions d'hameçons (%) -observe.common.individualSize=Taille (cm) -observe.common.individualWeight=Poids (kg) -observe.common.inputOutputFormula=Formule entrée -> sortie -observe.common.iso2Code=code ISO-2 -observe.common.iso3Code=Code ISO-3 -observe.common.itemHorizontalPosition=Position sur la ligne -observe.common.itemVerticalPosition=Position verticale -observe.common.keelCode=Code quille -observe.common.label=Libellé -observe.common.label1=Libellé anglais -observe.common.label2=Libellé français -observe.common.label3=Libellé espagnol -observe.common.landingHarbour=Port d'arrivée -observe.common.lastName=Nom -observe.common.latitude=Latitude -observe.common.length=Longueur hors tout -observe.common.lengthWeightFormula=Relation Poids -observe.common.lightsticksColor=Couleur de cyalumes -observe.common.lightsticksPerBasketCount=Nombre de cyalumes par panier -observe.common.lightsticksType=Type de cyalumes -observe.common.lineType=Type de ligne -observe.common.locode=Locode -observe.common.longitude=Longitude -observe.common.maturityStatus=Maturité sexuelle -observe.common.maxDepthTargeted=Profondeur maximum ciblée -observe.common.maxGearDepth=Profondeur maximum (m) -observe.common.meanLength=Taille moyenne (en cm) -observe.common.meanWeight=Poids moyen (en Kg) -observe.common.name=Nom -observe.common.nonTargetCatch=Faune accessoire conservée ou rejetée -observe.common.nonTargetCatchReleaseStatusType=État à la libération -observe.common.number=Nombre -observe.common.objectFate=Devenir de l'objet -observe.common.objectMaterialType=Type -observe.common.objectOperation=Opération sur l'objet -observe.common.objectType=Type d'objet -observe.common.observedSystem=Système observé -observe.common.observedSystemDistance=Distance système observé (en milles avec 1 décimale) -observe.common.observer=Observateur -observe.common.ocean=Océan -observe.common.organism=Organisme -observe.common.outputInputFormula=Formule sortie -> entrée -observe.common.power=Puissance moteur principal -observe.common.proportion=Proportion (%) -observe.common.quadrant=Quadrant -observe.common.reasonForDiscard=Raison rejet -observe.common.reasonForNoFishing=Raison de non coup de Senne -observe.common.reasonForNullSet=Cause coup nul -observe.common.releaseTime=Heure de libération -observe.common.reportsUrl=URL de rapport -observe.common.route=Route -observe.common.schoolEstimate=Estimation banc -observe.common.schoolMeanDepth=Profondeur moyenne (m) -observe.common.schoolThickness=Épaisseur du banc (m) -observe.common.schoolTopDepth=Profondeur sommet (m) -observe.common.scientificLabel=Libellé scientifique -observe.common.seaSurfaceTemperature=Température surface (°) -observe.common.searchMaximum=Vitesse maximale -observe.common.section=Section -observe.common.sensorBrand=Marque -observe.common.sensorDataFormat=Format de données -observe.common.sensorSerialNo=Numéro de série -observe.common.sensorType=Type -observe.common.settingEndLatitude=Latitude de fin de filage -observe.common.settingEndLongitude=Longitude de fin de filage -observe.common.settingEndQuadrant=Quadrant de fin de filage -observe.common.settingEndTimeStamp=Horodatage fin -observe.common.settingIdentifier=Filage -observe.common.settingShape=Forme du filage -observe.common.settingStartLatitude=Latitude de début de filage -observe.common.settingStartLongitude=Longitude de début de filage -observe.common.settingStartQuadrant=Quadrant de début de filage -observe.common.settingStartTimeStamp=Horodatage début -observe.common.settingVesselSpeed=Vitesse bateau (nd) -observe.common.sex=Sexe -observe.common.shipOwner=Armateur -observe.common.shooterSpeed=Vitesse shooter (nd) -observe.common.sizeMeasureType=Type de mensuration -observe.common.snapWeight=Poids snap (kg) -observe.common.species=Espèce -observe.common.speciesCatch=Espèce -observe.common.speciesFate=Devenir espèce -observe.common.speciesGroup=Groupe espèce -observe.common.speciesGroupReleaseMode=Mode de libération -observe.common.speciesGroupReleaseStatus=État à la libération -observe.common.speciesStatus=Statut faune observée -observe.common.speedRange=Libellé vitesse vent -observe.common.startDate=Début de validité -observe.common.startLogValue=Loch du matin (milles) -observe.common.startTime=Date - Heure de début de validité -observe.common.status=Statut -observe.common.stomacFullness=État de l'estomac -observe.common.supportVesselName=Nom supply -observe.common.surroundingActivity=Activité environnante -observe.common.swivelWeight=Poids de l'émerillon (kg) -observe.common.targetCatch=Capture cible -observe.common.time=Heure -observe.common.timeBetweenHooks=Temps entre hameçons (s) -observe.common.topType=Type -observe.common.totalBasketsCount=Nombre de paniers -observe.common.totalCount=Nombre estimé -observe.common.totalHooksCount=Nombre total d'avançons -observe.common.totalSectionsCount=Nombre total de sections -observe.common.totalWeight=Poids -observe.common.tracelineLength=Partie basse (m) -observe.common.tracelineType=Type bas de ligne -observe.common.transmittingBuoyOperation=Opération balise -observe.common.transmittingBuoyType=Type de balise -observe.common.tripType=Type de marée -observe.common.type=Type -observe.common.uri=URI -observe.common.vessel=Bateau -observe.common.vesselActivityLongline=Activité bateau -observe.common.vesselSizeCategory=Catégorie de bateau -observe.common.vesselSpeed=Vitesse bateau (nd) -observe.common.vesselType=Type de pêcherie -observe.common.waveHeight=Libellé Hauteur moyenne vagues -observe.common.weight=Poids (en t) -observe.common.weightCategory=Catégorie de poids -observe.common.weightLengthFormula=Relation Taille -observe.common.well=Cuve -observe.common.wind=Vent Beaufort -observe.common.wormsId=Worms -observe.common.yearService=Année de mise en service validator.service.activity.bound.latitude=La latitude doit être comprise entre %1$s et %2$s. validator.service.activity.bound.longitude=La longitude doit être comprise entre %1$s et %2$s. validator.service.activity.bound.seaSurfaceTemperature=La température doit être comprise entre %1$s et %2$s. @@ -305,6 +101,7 @@ validator.service.floatingObject.required.comment.for.type=Un commentaire est re validator.service.floatingObject.required.objectFate=La sélection d'un devenir d'objet est conseillée. validator.service.floatingObject.required.objectOperation=La sélection d'une opération d'objet est obligatoire. validator.service.floatingObject.required.type=La sélection d'un type d'objet est obligatoire. +validator.service.floatingObject.size.supportVesselName=La taille du nom supply est limitée à 1024 caractères. validator.service.floatlinesComposition.bound.length=La longueur doit être comprise entre %s et %s. validator.service.floatlinesComposition.bound.proportion=La proportion doit être comprise entre %s et %s. validator.service.floatlinesComposition.desactivated.lineType=Le type sélectionnée est désactivée. ===================================== services/pom.xml ===================================== --- a/services/pom.xml +++ b/services/pom.xml @@ -231,8 +231,6 @@ </execution> </executions> </plugin> - - </plugins> </build> ===================================== services/src/main/java/fr/ird/observe/services/ObserveDtoInitializer.java ===================================== --- a/services/src/main/java/fr/ird/observe/services/ObserveDtoInitializer.java +++ b/services/src/main/java/fr/ird/observe/services/ObserveDtoInitializer.java @@ -1142,18 +1142,21 @@ class ObserveDtoInitializer { n("observe.type.setLonglineCatch"); - n("observe.type.setLonglineCatches"); flushData(dataDefinitionBuilder(SetLonglineCatchDto.class)); } @Override public void initSetLonglineDetailCompositionDto() { + n("observe.type.setLonglineDetailComposition"); + n("observe.type.setLonglineDetailCompositions"); flushData(dataDefinitionBuilder(SetLonglineDetailCompositionDto.class)); } @Override public void initSetLonglineGlobalCompositionDto() { + n("observe.type.setLonglineGlobalComposition"); + n("observe.type.setLonglineGlobalCompositions"); flushData(dataDefinitionBuilder(SetLonglineGlobalCompositionDto.class)); } @@ -1169,10 +1172,7 @@ class ObserveDtoInitializer { @Override public void initSizeMeasureDto() { - - n("observe.type.sizeMeasure"); - n("observe.type.sizeMeasures"); flushData(dataDefinitionBuilder(SizeMeasureDto.class) .addProperty(String.class, SizeMeasureDto.PROPERTY_SIZE_MEASURE_TYPE) @@ -1181,10 +1181,7 @@ class ObserveDtoInitializer { @Override public void initTdrDto() { - - n("observe.type.tdr"); - n("observe.type.tdrs"); flushData(dataDefinitionBuilder(TdrDto.class).addProperty(String.class, TdrDto.PROPERTY_HOME_ID)); } ===================================== services/src/main/java/fr/ird/observe/services/decoration/ObserveI18nDecoratorHelper.java ===================================== --- a/services/src/main/java/fr/ird/observe/services/decoration/ObserveI18nDecoratorHelper.java +++ b/services/src/main/java/fr/ird/observe/services/decoration/ObserveI18nDecoratorHelper.java @@ -33,6 +33,7 @@ import org.apache.commons.lang3.StringUtils; import org.atteo.evo.inflector.English; +import static org.nuiton.i18n.I18n.n; import static org.nuiton.i18n.I18n.t; /** @@ -111,4 +112,215 @@ public class ObserveI18nDecoratorHelper { return getUnchecked((Class) key); } } + + static { + n("observe.common.activityLongline"); + n("observe.common.activitySeine"); + n("observe.common.baitHaulingStatus"); + n("observe.common.baitSettingStatus"); + n("observe.common.baitType"); + n("observe.common.baitsComposition"); + n("observe.common.baitsCompositionProportionSum"); + n("observe.common.basket"); + n("observe.common.basketsPerSectionCount"); + n("observe.common.branchline"); + n("observe.common.branchlineLength"); + n("observe.common.branchlinesComposition"); + n("observe.common.branchlinesCompositionProportionSum"); + n("observe.common.branchlinesPerBasketCount"); + n("observe.common.brandName"); + n("observe.common.capacity"); + n("observe.common.capacityLabel"); + n("observe.common.captain"); + n("observe.common.catchFateLongline"); + n("observe.common.catchHealthness"); + n("observe.common.catchWeight"); + n("observe.common.changeDate"); + n("observe.common.code"); + n("observe.common.coefficients"); + n("observe.common.comment"); + n("observe.common.count"); + n("observe.common.country"); + n("observe.common.currentDirection"); + n("observe.common.currentFpaZone"); + n("observe.common.currentSpeed"); + n("observe.common.dataEntryOperator"); + n("observe.common.date"); + n("observe.common.departureHarbour"); + n("observe.common.deployementEnd"); + n("observe.common.description"); + n("observe.common.detectionMode"); + n("observe.common.detectionTime"); + n("observe.common.discardHealthness"); + n("observe.common.distance"); + n("observe.common.encounterType"); + n("observe.common.endDate"); + n("observe.common.endLogValue"); + n("observe.common.endPursingDate"); + n("observe.common.endPursingTimeStamp"); + n("observe.common.endSetDate"); + n("observe.common.endSetTimeStamp"); + n("observe.common.faoCode"); + n("observe.common.firstName"); + n("observe.common.fishingEnd"); + n("observe.common.fishingStart"); + n("observe.common.flagCountry"); + n("observe.common.fleetCountry"); + n("observe.common.floatingObjectEmpty"); + n("observe.common.floatline1Length"); + n("observe.common.floatline2Length"); + n("observe.common.floatlinesComposition"); + n("observe.common.floatlinesCompositionProportionSum"); + n("observe.common.formsUrl"); + n("observe.common.fpaZone"); + n("observe.common.gaugeLabel"); + n("observe.common.gear"); + n("observe.common.gearCaracteristicType"); + n("observe.common.gearType"); + n("observe.common.gearUseFeaturesLongline"); + n("observe.common.gearUseFeaturesSeine"); + n("observe.common.gonadeWeight"); + n("observe.common.haulingBreaks"); + n("observe.common.haulingDirectionSameAsSetting"); + n("observe.common.haulingEndLatitude"); + n("observe.common.haulingEndLongitude"); + n("observe.common.haulingEndQuadrant"); + n("observe.common.haulingEndTimeStamp"); + n("observe.common.haulingStartLatitude"); + n("observe.common.haulingStartLongitude"); + n("observe.common.haulingStartQuadrant"); + n("observe.common.haulingStartTimeStamp"); + n("observe.common.homeId"); + n("observe.common.hookOffset"); + n("observe.common.hookPosition"); + n("observe.common.hookSize"); + n("observe.common.hookType"); + n("observe.common.hooksComposition"); + n("observe.common.hooksCompositionProportionSum"); + n("observe.common.individualSize"); + n("observe.common.individualWeight"); + n("observe.common.inputOutputFormula"); + n("observe.common.inputSizeMeasureType"); + n("observe.common.iso2Code"); + n("observe.common.iso3Code"); + n("observe.common.itemHorizontalPosition"); + n("observe.common.itemVerticalPosition"); + n("observe.common.keelCode"); + n("observe.common.label"); + n("observe.common.label1"); + n("observe.common.label2"); + n("observe.common.label3"); + n("observe.common.landingHarbour"); + n("observe.common.lastName"); + n("observe.common.latitude"); + n("observe.common.length"); + n("observe.common.lengthWeightFormula"); + n("observe.common.lightsticksColor"); + n("observe.common.lightsticksPerBasketCount"); + n("observe.common.lightsticksType"); + n("observe.common.lineType"); + n("observe.common.locode"); + n("observe.common.longitude"); + n("observe.common.maturityStatus"); + n("observe.common.maxDepthTargeted"); + n("observe.common.maxGearDepth"); + n("observe.common.meanLength"); + n("observe.common.meanWeight"); + n("observe.common.name"); + n("observe.common.nextFpaZone"); + n("observe.common.nonTargetCatch"); + n("observe.common.nonTargetCatchReleaseStatus"); + n("observe.common.number"); + n("observe.common.objectOperation"); + n("observe.common.objectType"); + n("observe.common.observedSystem"); + n("observe.common.observedSystemDistance"); + n("observe.common.observer"); + n("observe.common.ocean"); + n("observe.common.organism"); + n("observe.common.outputInputFormula"); + n("observe.common.outputSizeMeasureType"); + n("observe.common.power"); + n("observe.common.previousFpaZone"); + n("observe.common.proportion"); + n("observe.common.quadrant"); + n("observe.common.reasonForDiscard"); + n("observe.common.reasonForNoFishing"); + n("observe.common.reasonForNullSet"); + n("observe.common.releaseTime"); + n("observe.common.reportsUrl"); + n("observe.common.route"); + n("observe.common.schoolEstimate"); + n("observe.common.schoolMeanDepth"); + n("observe.common.schoolThickness"); + n("observe.common.schoolTopDepth"); + n("observe.common.scientificLabel"); + n("observe.common.seaSurfaceTemperature"); + n("observe.common.searchMaximum"); + n("observe.common.section"); + n("observe.common.sensorBrand"); + n("observe.common.sensorDataFormat"); + n("observe.common.sensorSerialNo"); + n("observe.common.sensorType"); + n("observe.common.settingEndLatitude"); + n("observe.common.settingEndLongitude"); + n("observe.common.settingEndQuadrant"); + n("observe.common.settingEndTimeStamp"); + n("observe.common.settingIdentifier"); + n("observe.common.settingShape"); + n("observe.common.settingStartLatitude"); + n("observe.common.settingStartLongitude"); + n("observe.common.settingStartQuadrant"); + n("observe.common.settingStartTimeStamp"); + n("observe.common.settingVesselSpeed"); + n("observe.common.sex"); + n("observe.common.shipOwner"); + n("observe.common.shooterSpeed"); + n("observe.common.sizeMeasureType"); + n("observe.common.snapWeight"); + n("observe.common.species"); + n("observe.common.speciesCatch"); + n("observe.common.speciesFate"); + n("observe.common.speciesGroup"); + n("observe.common.speciesGroupReleaseMode"); + n("observe.common.speciesStatus"); + n("observe.common.speedRange"); + n("observe.common.startDate"); + n("observe.common.startLogValue"); + n("observe.common.startTime"); + n("observe.common.status"); + n("observe.common.stomacFullness"); + n("observe.common.supportVesselName"); + n("observe.common.surroundingActivity"); + n("observe.common.swivelWeight"); + n("observe.common.targetCatch"); + n("observe.common.time"); + n("observe.common.timeBetweenHooks"); + n("observe.common.topType"); + n("observe.common.totalBasketsCount"); + n("observe.common.totalCount"); + n("observe.common.totalHooksCount"); + n("observe.common.totalSectionsCount"); + n("observe.common.totalWeight"); + n("observe.common.tracelineLength"); + n("observe.common.tracelineType"); + n("observe.common.transmittingBuoyOperation"); + n("observe.common.transmittingBuoyType"); + n("observe.common.tripType"); + n("observe.common.uri"); + n("observe.common.vessel"); + n("observe.common.vesselActivityLongline"); + n("observe.common.vesselActivitySeine"); + n("observe.common.vesselSizeCategory"); + n("observe.common.vesselSpeed"); + n("observe.common.vesselType"); + n("observe.common.waveHeight"); + n("observe.common.weight"); + n("observe.common.weightCategory"); + n("observe.common.weightLengthFormula"); + n("observe.common.well"); + n("observe.common.wind"); + n("observe.common.wormsId"); + n("observe.common.yearService"); + } } ===================================== services/src/main/resources/i18n/services_en_GB.properties ===================================== --- a/services/src/main/resources/i18n/services_en_GB.properties +++ b/services/src/main/resources/i18n/services_en_GB.properties @@ -1,15 +1,138 @@ +observe.common.activityLongline=Activity +observe.common.activitySeine=Activity +observe.common.baitHaulingStatus=Bait hauling status +observe.common.baitSettingStatus=Bait setting status +observe.common.baitType=Bait type +observe.common.baitsComposition=Baits composition +observe.common.baitsCompositionProportionSum=Baits composition proportion sum +observe.common.basket=Basket +observe.common.basketsPerSectionCount=Basket per section count +observe.common.branchline=Branchline +observe.common.branchlineLength=Branchline length +observe.common.branchlinesComposition=Branchlines composition +observe.common.branchlinesCompositionProportionSum=Branchlines composition proportion sum +observe.common.branchlinesPerBasketCount=Branchlines per basket count +observe.common.brandName=Brand name +observe.common.capacity=Capacity +observe.common.capacityLabel=Capacity label +observe.common.captain=Captain +observe.common.catchFateLongline=Catch fate +observe.common.catchHealthness=Catch healthness +observe.common.catchWeight=Catch weight +observe.common.changeDate=Change date +observe.common.code=Code +observe.common.coefficients=Coefficients +observe.common.comment=Comment +observe.common.count=Count +observe.common.country=Country +observe.common.currentDirection=Current direction +observe.common.currentFpaZone=Current Fpa zone +observe.common.currentSpeed=Current speed +observe.common.dataEntryOperator=Data entry operator +observe.common.date=Date +observe.common.daysAtSeaCount=Days at sea count +observe.common.departureHarbour=Departure harbour +observe.common.deployementEnd=Deployement end +observe.common.description=Description +observe.common.detectionMode=Detection mode +observe.common.detectionTime=Detection time +observe.common.discardHealthness=Discard healthness +observe.common.distance=Distance +observe.common.encounterType=Encounter type +observe.common.endDate=End date +observe.common.endLogValue=End log value +observe.common.endPursingDate=End pursing date +observe.common.endPursingTimeStamp=End pursing timestamp +observe.common.endSetDate=End set date +observe.common.endSetTimeStamp=End set timestamp observe.common.faoCode=Fao code +observe.common.firstName=First name +observe.common.fishingEnd=Fishing end +observe.common.fishingStart=Fishing start +observe.common.flagCountry=Flag country +observe.common.fleetCountry=Fleet country +observe.common.floatingObject=Floating object +observe.common.floatingObjectEmpty=Empty floating object +observe.common.floatline1Length=floatline 1 length +observe.common.floatline2Length=floatline 2 length +observe.common.floatlinesComposition=floatlines composition +observe.common.floatlinesCompositionProportionSum=floatlines composition proportion sum +observe.common.formsUrl=Forms url +observe.common.fpaZone=Fpa zone +observe.common.gaugeLabel=Gauge label +observe.common.gear=Gear +observe.common.gearCaracteristicType=Gear caracteristic type +observe.common.gearType=Gear type +observe.common.gearUseFeaturesLongline=Gear use features +observe.common.gearUseFeaturesSeine=Gear use features +observe.common.gonadeWeight=Gonade weight observe.common.gps.activity=Activity observe.common.gps.gpsPoint=Gps point +observe.common.haulingBreaks=Hauling breaks +observe.common.haulingDirectionSameAsSetting=Hauling direction same as setting +observe.common.haulingEndLatitude=Hauling end latitude +observe.common.haulingEndLongitude=Hauling end longitude +observe.common.haulingEndQuadrant=Hauling end quadrant +observe.common.haulingEndTimeStamp=Hauling end timeStamp observe.common.haulingIdentifier=Hauling identifier +observe.common.haulingStartLatitude=Hauling start latitude +observe.common.haulingStartLongitude=Hauling start longitude +observe.common.haulingStartQuadrant=Hauling start quadrant +observe.common.haulingStartTimeStamp=Hauling start timeStamp observe.common.homeId=Home id +observe.common.hookOffset=Hook offset +observe.common.hookPosition=Hook position +observe.common.hookSize=Hook size +observe.common.hookType=Hook type +observe.common.hooksComposition=hooks composition +observe.common.hooksCompositionProportionSum=hooks composition proportion sum observe.common.inconnu=Unknown +observe.common.individualSize=Individual size +observe.common.individualWeight=Individual weight observe.common.inputOutputFormula=Input to Output formula +observe.common.inputSizeMeasureType=Input size measure type +observe.common.iso2Code=Iso 2 code +observe.common.iso3Code=Iso 3 code +observe.common.itemHorizontalPosition=Item horizontal position +observe.common.itemVerticalPosition=Item vertical position +observe.common.keelCode=Keel code observe.common.label=Label +observe.common.label1=English label +observe.common.label2=French label +observe.common.label3=Spanish label +observe.common.landingHarbour=Landing harbour +observe.common.lastName=Last name +observe.common.latitude=Latitude +observe.common.length=Length observe.common.lengthWeightFormula=Length weight formula +observe.common.lightsticksColor=Lightsticks color +observe.common.lightsticksPerBasketCount=Lightsticks per basket count +observe.common.lightsticksType=Lightsticks type +observe.common.lineType=Line type +observe.common.locode=Locode +observe.common.longitude=Longitude +observe.common.maturityStatus=Maturity status +observe.common.maxDepthTargeted=Max depth targeted +observe.common.maxGearDepth=Max gear depth +observe.common.meanLength=Mean length +observe.common.meanWeight=Mean weight +observe.common.name=Name +observe.common.nextFpaZone=Next Fpa zone observe.common.nocode=Nocode +observe.common.nonTargetCatch=Non target catch +observe.common.nonTargetCatchReleaseStatus=Release state +observe.common.nonTargetCatchReleaseStatusType=Release state observe.common.none=None +observe.common.number=Number +observe.common.objectFate=Object fate +observe.common.objectMaterialType=Type +observe.common.objectOperation=Object operation +observe.common.objectType=Object type +observe.common.observedSystem=Observed system +observe.common.observedSystemDistance=Observed system distance +observe.common.observer=Observed observe.common.observerLabel=Observer label +observe.common.ocean=Ocean observe.common.ocean/label1=Ocean observe.common.ocean/label2=Ocean observe.common.ocean/label3=Ocean @@ -18,11 +141,82 @@ observe.common.ocean/label5=Ocean observe.common.ocean/label6=Ocean observe.common.ocean/label7=Ocean observe.common.ocean/label8=Ocean +observe.common.organism=Organism +observe.common.outputInputFormula=Output to Input formula +observe.common.outputSizeMeasureType=Output size measure type +observe.common.power=Power +observe.common.previousFpaZone=Previous Fpa zone observe.common.program=Program +observe.common.proportion=Proportion +observe.common.quadrant=Quadrant +observe.common.reasonForDiscard=Reason for discad +observe.common.reasonForNoFishing=Reason for no fishing +observe.common.reasonForNullSet=Reason for null set +observe.common.releaseTime=Release time +observe.common.reportsUrl=Reports url +observe.common.route=Route +observe.common.schoolEstimate=School estimate +observe.common.schoolMeanDepth=School mean depth +observe.common.schoolThickness=School thickness +observe.common.schoolTopDepth=School top depth observe.common.scientificLabel=Scientific label +observe.common.seaSurfaceTemperature=Sea surface temperature +observe.common.searchMaximum=Search maximum +observe.common.section=Section +observe.common.sensorBrand=Sensor brand +observe.common.sensorDataFormat=Sensor data format +observe.common.sensorSerialNo=Sensor serial no +observe.common.sensorType=Sensor type +observe.common.settingEndLatitude=Setting end latitude +observe.common.settingEndLongitude=Setting end longitude +observe.common.settingEndQuadrant=Setting end quadrant +observe.common.settingEndTimeStamp=Setting end timeStamp observe.common.settingIdentifier=Setting +observe.common.settingShape=Setting shape +observe.common.settingStartLatitude=Setting start latitude +observe.common.settingStartLongitude=Setting start longitude +observe.common.settingStartQuadrant=Setting start quadrant +observe.common.settingStartTimeStamp=Setting start timeStamp +observe.common.settingVesselSpeed=Setting vessel speed observe.common.sex=Sex +observe.common.shipOwner=Ship owner +observe.common.shooterSpeed=Shooter speed +observe.common.sizeMeasureType=Size measure type +observe.common.snapWeight=Snap weight +observe.common.species=Species observe.common.species/scientificLabel=Scientific label +observe.common.speciesCatch=Species +observe.common.speciesFate=Species fate +observe.common.speciesGroup=Species group +observe.common.speciesGroupReleaseMode=Release mode +observe.common.speciesGroupReleaseStatus=Release state +observe.common.speciesStatus=Species status +observe.common.speedRange=Speed range +observe.common.startDate=Start date +observe.common.startLogValue=Start log value +observe.common.startTime=Sart time +observe.common.status=Status +observe.common.stomacFullness=Stomac fullness +observe.common.supportVesselName=Support vessel name +observe.common.surroundingActivity=Surrounding activity +observe.common.swivelWeight=Swivel weight +observe.common.targetCatch=Target catch +observe.common.time=Time +observe.common.timeBetweenHooks=Time between hooks +observe.common.topType=Top type +observe.common.totalBasketsCount=Total baskets count +observe.common.totalCount=Count +observe.common.totalHooksCount=Total hooks count +observe.common.totalSectionsCount=Total section count +observe.common.totalWeight=Total weight +observe.common.tracelineLength=Traceline length +observe.common.tracelineType=Traceline type +observe.common.transmittingBuoyOperation=Transmitting buoy operation +observe.common.transmittingBuoyType=Transmitting buoy type +observe.common.tripType=Trip type +observe.common.type=Type +observe.common.uri=Uri +observe.common.vessel=Boat observe.common.vessel/label1=Vessel observe.common.vessel/label2=Vessel observe.common.vessel/label3=Vessel @@ -31,6 +225,8 @@ observe.common.vessel/label5=Vessel observe.common.vessel/label6=Vessel observe.common.vessel/label7=Vessel observe.common.vessel/label8=Vessel +observe.common.vesselActivityLongline=Vessel activity +observe.common.vesselActivitySeine=Vessel activity observe.common.vesselActivitySeine/label1=Vessel activity observe.common.vesselActivitySeine/label2=Vessel activity observe.common.vesselActivitySeine/label3=Vessel activity @@ -39,6 +235,17 @@ observe.common.vesselActivitySeine/label5=Vessel activity observe.common.vesselActivitySeine/label6=Vessel activity observe.common.vesselActivitySeine/label7=Vessel activity observe.common.vesselActivitySeine/label8=Vessel activity +observe.common.vesselSizeCategory=Vessel size category +observe.common.vesselSpeed=Vessel spped +observe.common.vesselType=Vessel type +observe.common.waveHeight=Wave weight +observe.common.weight=Weight +observe.common.weightCategory=Weight category +observe.common.weightLengthFormula=Weight length formula +observe.common.well=Well +observe.common.wind=Wind +observe.common.wormsId=Worms id +observe.common.yearService=Year service observe.type.activityLongline=Activity observe.type.activityLonglineEncounter=Encounter observe.type.activityLonglineEncounters=Encounters ===================================== services/src/main/resources/i18n/services_es_ES.properties ===================================== --- a/services/src/main/resources/i18n/services_es_ES.properties +++ b/services/src/main/resources/i18n/services_es_ES.properties @@ -1,15 +1,138 @@ +observe.common.activityLongline=Actividad +observe.common.activitySeine=Actividad +observe.common.baitHaulingStatus=Estatuto del cebo en el arrastre +observe.common.baitSettingStatus=Estatuto del cebo en la calada +observe.common.baitType=Tipo de cebo +observe.common.baitsComposition=Cebo +observe.common.baitsCompositionProportionSum=Suma de los proporciónes de cebo (%) +observe.common.basket=Cesta +observe.common.basketsPerSectionCount=Número de cestas por sección +observe.common.branchline=Arponcillo +observe.common.branchlineLength=Arponcillo (m) +observe.common.branchlinesComposition=Arponcillos +observe.common.branchlinesCompositionProportionSum=Suma de los proporciónes de arponcillos (%) +observe.common.branchlinesPerBasketCount=Número de anzuelos por cesta +observe.common.brandName=Marca +observe.common.capacity=Capacidad de transporte +observe.common.capacityLabel=Texto capacidad +observe.common.captain=Patrón +observe.common.catchFateLongline=Futuro de la captura +observe.common.catchHealthness=Salud a la captura +observe.common.catchWeight=Peso estimado (en t) +observe.common.changeDate=Fecha de carga +observe.common.code=Identificación +observe.common.coefficients=Coeficientes +observe.common.comment=Comentarios +observe.common.count=Número +observe.common.country=País +observe.common.currentDirection=Direction du courant (°) +observe.common.currentFpaZone=Zona FPA actual +observe.common.currentSpeed=Velocidad del corriente (nd) +observe.common.dataEntryOperator=Operador de captación de datos +observe.common.date=Día de observación +observe.common.daysAtSeaCount=Numero de días en el mar +observe.common.departureHarbour=Puerto de embarque +observe.common.deployementEnd=Fin de despliegue +observe.common.description=Descripción +observe.common.detectionMode=Modo de detección +observe.common.detectionTime=Heure de détection \#TODO +observe.common.discardHealthness=Salud al rechazo +observe.common.distance=Distancia (m) +observe.common.encounterType=Tipo de encuentro +observe.common.endDate=Fecha de fin +observe.common.endLogValue=Corredera de tarde (millas) +observe.common.endPursingDate=Fecha de fin de calado de la red +observe.common.endPursingTimeStamp=Fecha - Hora de fin de calado de la red +observe.common.endSetDate=Fecha de fin de calado de la red +observe.common.endSetTimeStamp=Fecha - Hora de fin de validez observe.common.faoCode=Codigo FAO +observe.common.firstName=Número +observe.common.fishingEnd=Fin de pesca +observe.common.fishingStart=Inicio de pesca +observe.common.flagCountry=Bandera +observe.common.fleetCountry=País +observe.common.floatingObject=Objeto flotante +observe.common.floatingObjectEmpty=Objeto flotante vacía +observe.common.floatline1Length=Orinque 1 (m) +observe.common.floatline2Length=Orinque 2 (m) +observe.common.floatlinesComposition=Orinques +observe.common.floatlinesCompositionProportionSum=Suma de los proporciónes de los orinques (%) +observe.common.formsUrl=URL de los formularios +observe.common.fpaZone=Zona FPA +observe.common.gaugeLabel=Texto «Capacidad» +observe.common.gear=Equipamiento +observe.common.gearCaracteristicType=Tipo de característica de equipamientos +observe.common.gearType=Tipo de arte de pesca +observe.common.gearUseFeaturesLongline=Equipamiento +observe.common.gearUseFeaturesSeine=Equipamiento +observe.common.gonadeWeight=Peso de las gonadas (g) observe.common.gps.activity=Actividad observe.common.gps.gpsPoint=Punto GPS +observe.common.haulingBreaks=Número de cortes +observe.common.haulingDirectionSameAsSetting=Sentido del arrastre idéntico a lo de la calada +observe.common.haulingEndLatitude=Arrastre Latitud +observe.common.haulingEndLongitude=Arrastre Longitud +observe.common.haulingEndQuadrant=Arrastre Quadrant +observe.common.haulingEndTimeStamp=Timestamp de fin observe.common.haulingIdentifier=Arrastre +observe.common.haulingStartLatitude=Arrastre Latitud +observe.common.haulingStartLongitude=Arrastre Longitud +observe.common.haulingStartQuadrant=Arrastre Quadrant +observe.common.haulingStartTimeStamp=Timestamp del inicio observe.common.homeId=Identificador +observe.common.hookOffset=Offset anzuelo (°) +observe.common.hookPosition=Posición del anzuelo +observe.common.hookSize=Tamaño +observe.common.hookType=Tipo de anzuelo +observe.common.hooksComposition=Anzuelos +observe.common.hooksCompositionProportionSum=Suma de los proporciónes de anzuelos (%) observe.common.inconnu=desconocido +observe.common.individualSize=Tamaño (cm) +observe.common.individualWeight=Peso (kg) observe.common.inputOutputFormula=Formule Entrée vers Sortie \#TODO +observe.common.inputSizeMeasureType=Type de mensuration d'entrée \#TODO +observe.common.iso2Code=Código ISO-2 +observe.common.iso3Code=Código ISO-3 +observe.common.itemHorizontalPosition=Localización del elemento sobre la línea principal +observe.common.itemVerticalPosition=Localización del elemento sobre el arponcillo +observe.common.keelCode=Código de Quilla observe.common.label=Texto +observe.common.label1=Texto en inglés +observe.common.label2=Texto en francés +observe.common.label3=Nombre +observe.common.landingHarbour=Puerto de desembarque +observe.common.lastName=Nombre +observe.common.latitude=Latitud +observe.common.length=Longitud eslora total observe.common.lengthWeightFormula=Relación de peso +observe.common.lightsticksColor=Color de barrita de luz +observe.common.lightsticksPerBasketCount=Número de barrita de luz por cesta +observe.common.lightsticksType=Tipo de barrita de luz +observe.common.lineType=Tipo de línea +observe.common.locode=Locode +observe.common.longitude=Longitude +observe.common.maturityStatus=Maturidad +observe.common.maxDepthTargeted=Profundidad máxima deseada +observe.common.maxGearDepth=Profundidad máxima (m) +observe.common.meanLength=Talla media (en cm) +observe.common.meanWeight=Peso medio (en Kg) +observe.common.name=Nombre +observe.common.nextFpaZone=Zona FPA penetrada observe.common.nocode=codigo ausente +observe.common.nonTargetCatch=Fauna accesoria conservada o descartada +observe.common.nonTargetCatchReleaseStatus=État à la libération \#TODO +observe.common.nonTargetCatchReleaseStatusType=État à la libération \#TODO observe.common.none=Ninguno +observe.common.number=Número +observe.common.objectFate=Devenir de objeto +observe.common.objectMaterialType=Type \#TODO +observe.common.objectOperation=Operación sobre la baliza +observe.common.objectType=Tipo de objeto +observe.common.observedSystem=Sistema observado +observe.common.observedSystemDistance=Distancia al sistema observado (millas con 1 decimal) +observe.common.observer=Observador observe.common.observerLabel=Observador +observe.common.ocean=Océano observe.common.ocean/label1=Océano observe.common.ocean/label2=Océano observe.common.ocean/label3=Océano @@ -18,11 +141,82 @@ observe.common.ocean/label5=Océano observe.common.ocean/label6=Océano observe.common.ocean/label7=Océano observe.common.ocean/label8=Océano +observe.common.organism=Organismo +observe.common.outputInputFormula=Formule Sortie vers Entrée \#TODO +observe.common.outputSizeMeasureType=Type de mensuration de sortie \#TODO +observe.common.power=Potencia del motor principal +observe.common.previousFpaZone=La zona FPA de que se salió observe.common.program=Programa +observe.common.proportion=Proporción (%) +observe.common.quadrant=Quadrant +observe.common.reasonForDiscard=Razón de descarte +observe.common.reasonForNoFishing=Razón de no pesca Senne +observe.common.reasonForNullSet=Causa de lance nulo +observe.common.releaseTime=Heure de libération \#TODO +observe.common.reportsUrl=URL del informe +observe.common.route=Ruta +observe.common.schoolEstimate=Estimación del banco +observe.common.schoolMeanDepth=Profundidad media (m) +observe.common.schoolThickness=Grossor del banco (m) +observe.common.schoolTopDepth=Profundidad de la cumbre (m) observe.common.scientificLabel=Texto científico +observe.common.seaSurfaceTemperature=Temperatura en superficie (°) +observe.common.searchMaximum=Velocidad máxima de prospección +observe.common.section=Sección +observe.common.sensorBrand=Marca de sensor +observe.common.sensorDataFormat=Formato de los datos del sensor +observe.common.sensorSerialNo=Número de serie +observe.common.sensorType=Tipo de sensor +observe.common.settingEndLatitude=Calada Latitud +observe.common.settingEndLongitude=Calada longitud +observe.common.settingEndQuadrant=Calada quadrant +observe.common.settingEndTimeStamp=Timestamp de fin observe.common.settingIdentifier=Calada +observe.common.settingShape=Forma de la calada +observe.common.settingStartLatitude=Calada Latitud +observe.common.settingStartLongitude=Calada longitud +observe.common.settingStartQuadrant=Calada quadrant +observe.common.settingStartTimeStamp=Timestamp de inicio +observe.common.settingVesselSpeed=Velocidad del barco (nd) observe.common.sex=Sexo +observe.common.shipOwner=Armateur \#TODO +observe.common.shooterSpeed=Velocidad shooter (nd) +observe.common.sizeMeasureType=Tipo de medida +observe.common.snapWeight=Peso snap (kg) +observe.common.species=Especie observe.common.species/scientificLabel=Especie +observe.common.speciesCatch=Especie +observe.common.speciesFate=Devenir de fauna +observe.common.speciesGroup=Grupo de especie de fauna +observe.common.speciesGroupReleaseMode=Mode de libération \#TODO +observe.common.speciesGroupReleaseStatus=État à la libération \#TODO +observe.common.speciesStatus=Estado de especie +observe.common.speedRange=Texto velocidad del viento +observe.common.startDate=Fecha de comienzo +observe.common.startLogValue=Corredera de mañana (millas) +observe.common.startTime=Fecha - Heuro de inicio de validez +observe.common.status=Estado +observe.common.stomacFullness=Nivel de llenado del estomago +observe.common.supportVesselName=Nombre del macicero +observe.common.surroundingActivity=Actividad circundante +observe.common.swivelWeight=Peso de el destorcedor (kg) +observe.common.targetCatch=Captura de atún +observe.common.time=Hora +observe.common.timeBetweenHooks=Temps entre anzuelos (s) +observe.common.topType=Tipo parte superior +observe.common.totalBasketsCount=Número total de baskets +observe.common.totalCount=Número estimado +observe.common.totalHooksCount=Número total d'arponcillos +observe.common.totalSectionsCount=Número total de secciones +observe.common.totalWeight=Peso +observe.common.tracelineLength=Parte baja (m) +observe.common.tracelineType=Tipo bajo de línea +observe.common.transmittingBuoyOperation=Operación sobre baliza +observe.common.transmittingBuoyType=Tipo de baliza +observe.common.tripType=Tipo de marea +observe.common.type=Type \#TODO +observe.common.uri=URI +observe.common.vessel=Barco observe.common.vessel/label1=Buque observe.common.vessel/label2=Buque observe.common.vessel/label3=Buque @@ -31,6 +225,8 @@ observe.common.vessel/label5=Buque observe.common.vessel/label6=Buque observe.common.vessel/label7=Buque observe.common.vessel/label8=Buque +observe.common.vesselActivityLongline=Actividad buque +observe.common.vesselActivitySeine=Actividad buque observe.common.vesselActivitySeine/label1=Actividad buque observe.common.vesselActivitySeine/label2=Actividad buque observe.common.vesselActivitySeine/label3=Actividad buque @@ -39,6 +235,17 @@ observe.common.vesselActivitySeine/label5=Actividad buque observe.common.vesselActivitySeine/label6=Actividad buque observe.common.vesselActivitySeine/label7=Actividad buque observe.common.vesselActivitySeine/label8=Actividad buque +observe.common.vesselSizeCategory=Capacidad +observe.common.vesselSpeed=Velocidad del barco (nd) +observe.common.vesselType=Pesquería +observe.common.waveHeight=Texto descriptivo de «altura media de la ola» +observe.common.weight=Peso (en t) +observe.common.weightCategory=Categoría de peso +observe.common.weightLengthFormula=Relación de tallas +observe.common.well=Cuba +observe.common.wind=Fuerza del viento +observe.common.wormsId=Worms +observe.common.yearService=año de entrada en servicio observe.type.activityLongline=Actividad observe.type.activityLonglineEncounter=Encuentro observe.type.activityLonglineEncounters=Encuentros ===================================== services/src/main/resources/i18n/services_fr_FR.properties ===================================== --- a/services/src/main/resources/i18n/services_fr_FR.properties +++ b/services/src/main/resources/i18n/services_fr_FR.properties @@ -1,15 +1,138 @@ +observe.common.activityLongline=Activité +observe.common.activitySeine=Activité +observe.common.baitHaulingStatus=Statut appât au virage +observe.common.baitSettingStatus=Statut appât au filage +observe.common.baitType=Type d'appât +observe.common.baitsComposition=Appâts +observe.common.baitsCompositionProportionSum=Somme des proportions d'appâts (%) +observe.common.basket=Panier +observe.common.basketsPerSectionCount=Nombre de panier par section +observe.common.branchline=Avançon +observe.common.branchlineLength=Longueur Avançon (m) +observe.common.branchlinesComposition=Avançons +observe.common.branchlinesCompositionProportionSum=Somme des proportions d'avançons (%) +observe.common.branchlinesPerBasketCount=Nombre d'hameçons par panier +observe.common.brandName=Marque +observe.common.capacity=Capacité transport (m³) +observe.common.capacityLabel=Libellé capacité +observe.common.captain=Capitaine +observe.common.catchFateLongline=Devenir +observe.common.catchHealthness=Santé à la capture +observe.common.catchWeight=Poids estimé (en t) +observe.common.changeDate=Date changement pavillon +observe.common.code=Identifiant +observe.common.coefficients=Coefficients +observe.common.comment=Commentaire +observe.common.count=Nombre +observe.common.country=Pays +observe.common.currentDirection=Direction du courant (°) +observe.common.currentFpaZone=Zone FPA actuelle +observe.common.currentSpeed=Vitesse du courant (nd) +observe.common.dataEntryOperator=Saisisseur +observe.common.date=Jour d'observation +observe.common.daysAtSeaCount=Nombre de jours à l'eau +observe.common.departureHarbour=Port de départ +observe.common.deployementEnd=Fin déploiement +observe.common.description=Description +observe.common.detectionMode=Mode détection +observe.common.detectionTime=Heure de détection +observe.common.discardHealthness=Santé au rejet +observe.common.distance=Distance (m) +observe.common.encounterType=Type +observe.common.endDate=Fin de validité +observe.common.endLogValue=Loch du soir (milles) +observe.common.endPursingDate=Date de fin coulissage +observe.common.endPursingTimeStamp=Date - Heure de fin coulissage +observe.common.endSetDate=Date fin calée +observe.common.endSetTimeStamp=Date - Heure de fin de validité observe.common.faoCode=Code FAO +observe.common.firstName=Prénom +observe.common.fishingEnd=Fin pêche +observe.common.fishingStart=Début pêche +observe.common.flagCountry=Pavillon +observe.common.fleetCountry=Flotte +observe.common.floatingObject=Objet flottant +observe.common.floatingObjectEmpty=Objet flottant vide +observe.common.floatline1Length=Orin 1 (m) +observe.common.floatline2Length=Orin 2 (m) +observe.common.floatlinesComposition=Orins +observe.common.floatlinesCompositionProportionSum=Somme des proportions d'orins (%) +observe.common.formsUrl=URL des formulaires +observe.common.fpaZone=Zone FPA +observe.common.gaugeLabel=Libellé jauge +observe.common.gear=Equipement +observe.common.gearCaracteristicType=Type de caractéristique +observe.common.gearType=Type d'engin +observe.common.gearUseFeaturesLongline=Équipements +observe.common.gearUseFeaturesSeine=Équipements +observe.common.gonadeWeight=Poids des gonades (g) observe.common.gps.activity=Activité observe.common.gps.gpsPoint=Point GPS +observe.common.haulingBreaks=Nombre de coupures +observe.common.haulingDirectionSameAsSetting=Sens du virage identique à celui du filage +observe.common.haulingEndLatitude=Latitude de fin de virage +observe.common.haulingEndLongitude=Longitude de fin de virage +observe.common.haulingEndQuadrant=Quadrant de fin de virage +observe.common.haulingEndTimeStamp=Horodatage fin observe.common.haulingIdentifier=Virage +observe.common.haulingStartLatitude=Latitude de début de virage +observe.common.haulingStartLongitude=Longitude de début de virage +observe.common.haulingStartQuadrant=Quadrant de début de virage +observe.common.haulingStartTimeStamp=Horodatage début observe.common.homeId=Identifiant +observe.common.hookOffset=Offset hameçon (°) +observe.common.hookPosition=Position de l'hameçon +observe.common.hookSize=Taille d'hameçon +observe.common.hookType=Type d'hameçon +observe.common.hooksComposition=Hameçons +observe.common.hooksCompositionProportionSum=Somme des proportions d'hameçons (%) observe.common.inconnu=inconnu +observe.common.individualSize=Taille (cm) +observe.common.individualWeight=Poids (kg) observe.common.inputOutputFormula=Formule entrée -> sortie +observe.common.inputSizeMeasureType=Type de mensuration d'entrée +observe.common.iso2Code=code ISO-2 +observe.common.iso3Code=Code ISO-3 +observe.common.itemHorizontalPosition=Position sur la ligne +observe.common.itemVerticalPosition=Position verticale +observe.common.keelCode=Code quille observe.common.label=Libellé +observe.common.label1=Libellé anglais +observe.common.label2=Libellé français +observe.common.label3=Libellé espagnol +observe.common.landingHarbour=Port d'arrivée +observe.common.lastName=Nom +observe.common.latitude=Latitude +observe.common.length=Longueur hors tout observe.common.lengthWeightFormula=Relation Poids +observe.common.lightsticksColor=Couleur de cyalumes +observe.common.lightsticksPerBasketCount=Nombre de cyalumes par panier +observe.common.lightsticksType=Type de cyalumes +observe.common.lineType=Type de ligne +observe.common.locode=Locode +observe.common.longitude=Longitude +observe.common.maturityStatus=Maturité sexuelle +observe.common.maxDepthTargeted=Profondeur maximum ciblée +observe.common.maxGearDepth=Profondeur maximum (m) +observe.common.meanLength=Taille moyenne (en cm) +observe.common.meanWeight=Poids moyen (en Kg) +observe.common.name=Nom +observe.common.nextFpaZone=Zone FPA pénétrée observe.common.nocode=code absent +observe.common.nonTargetCatch=Faune accessoire conservée ou rejetée +observe.common.nonTargetCatchReleaseStatus=État à la libération +observe.common.nonTargetCatchReleaseStatusType=État à la libération observe.common.none=Aucun +observe.common.number=Nombre +observe.common.objectFate=Devenir de l'objet +observe.common.objectMaterialType=Type +observe.common.objectOperation=Opération sur l'objet +observe.common.objectType=Type d'objet +observe.common.observedSystem=Système observé +observe.common.observedSystemDistance=Distance système observé (en milles avec 1 décimale) +observe.common.observer=Observateur observe.common.observerLabel=Observateur +observe.common.ocean=Océan observe.common.ocean/label1=Océan observe.common.ocean/label2=Océan observe.common.ocean/label3=Océan @@ -18,11 +141,82 @@ observe.common.ocean/label5=Océan observe.common.ocean/label6=Océan observe.common.ocean/label7=Océan observe.common.ocean/label8=Océan +observe.common.organism=Organisme +observe.common.outputInputFormula=Formule sortie -> entrée +observe.common.outputSizeMeasureType=Type de mensuration de sortie +observe.common.power=Puissance moteur principal +observe.common.previousFpaZone=Zone FPA quittée observe.common.program=Programme +observe.common.proportion=Proportion (%) +observe.common.quadrant=Quadrant +observe.common.reasonForDiscard=Raison rejet +observe.common.reasonForNoFishing=Raison de non coup de Senne +observe.common.reasonForNullSet=Cause coup nul +observe.common.releaseTime=Heure de libération +observe.common.reportsUrl=URL de rapport +observe.common.route=Route +observe.common.schoolEstimate=Estimation banc +observe.common.schoolMeanDepth=Profondeur moyenne (m) +observe.common.schoolThickness=Épaisseur du banc (m) +observe.common.schoolTopDepth=Profondeur sommet (m) observe.common.scientificLabel=Libellé scientifique +observe.common.seaSurfaceTemperature=Température surface (°) +observe.common.searchMaximum=Vitesse maximale +observe.common.section=Section +observe.common.sensorBrand=Marque +observe.common.sensorDataFormat=Format de données +observe.common.sensorSerialNo=Numéro de série +observe.common.sensorType=Type +observe.common.settingEndLatitude=Latitude de fin de filage +observe.common.settingEndLongitude=Longitude de fin de filage +observe.common.settingEndQuadrant=Quadrant de fin de filage +observe.common.settingEndTimeStamp=Horodatage fin observe.common.settingIdentifier=Filage +observe.common.settingShape=Forme du filage +observe.common.settingStartLatitude=Latitude de début de filage +observe.common.settingStartLongitude=Longitude de début de filage +observe.common.settingStartQuadrant=Quadrant de début de filage +observe.common.settingStartTimeStamp=Horodatage début +observe.common.settingVesselSpeed=Vitesse bateau (nd) observe.common.sex=Sexe +observe.common.shipOwner=Armateur +observe.common.shooterSpeed=Vitesse shooter (nd) +observe.common.sizeMeasureType=Type de mensuration +observe.common.snapWeight=Poids snap (kg) +observe.common.species=Espèce observe.common.species/scientificLabel=Espèce +observe.common.speciesCatch=Espèce +observe.common.speciesFate=Devenir espèce +observe.common.speciesGroup=Groupe espèce +observe.common.speciesGroupReleaseMode=Mode de libération +observe.common.speciesGroupReleaseStatus=État à la libération +observe.common.speciesStatus=Statut faune observée +observe.common.speedRange=Libellé vitesse vent +observe.common.startDate=Début de validité +observe.common.startLogValue=Loch du matin (milles) +observe.common.startTime=Date - Heure de début de validité +observe.common.status=Statut +observe.common.stomacFullness=État de l'estomac +observe.common.supportVesselName=Nom supply +observe.common.surroundingActivity=Activité environnante +observe.common.swivelWeight=Poids de l'émerillon (kg) +observe.common.targetCatch=Capture cible +observe.common.time=Heure +observe.common.timeBetweenHooks=Temps entre hameçons (s) +observe.common.topType=Type +observe.common.totalBasketsCount=Nombre de paniers +observe.common.totalCount=Nombre estimé +observe.common.totalHooksCount=Nombre total d'avançons +observe.common.totalSectionsCount=Nombre total de sections +observe.common.totalWeight=Poids +observe.common.tracelineLength=Partie basse (m) +observe.common.tracelineType=Type bas de ligne +observe.common.transmittingBuoyOperation=Opération balise +observe.common.transmittingBuoyType=Type de balise +observe.common.tripType=Type de marée +observe.common.type=Type +observe.common.uri=URI +observe.common.vessel=Bateau observe.common.vessel/label1=Bateau observe.common.vessel/label2=Bateau observe.common.vessel/label3=Bateau @@ -31,6 +225,8 @@ observe.common.vessel/label5=Bateau observe.common.vessel/label6=Bateau observe.common.vessel/label7=Bateau observe.common.vessel/label8=Bateau +observe.common.vesselActivityLongline=Activité bateau +observe.common.vesselActivitySeine=Activité bateau observe.common.vesselActivitySeine/label1=Activité bateau observe.common.vesselActivitySeine/label2=Activité bateau observe.common.vesselActivitySeine/label3=Activité bateau @@ -39,6 +235,17 @@ observe.common.vesselActivitySeine/label5=Activité bateau observe.common.vesselActivitySeine/label6=Activité bateau observe.common.vesselActivitySeine/label7=Activité bateau observe.common.vesselActivitySeine/label8=Activité bateau +observe.common.vesselSizeCategory=Catégorie de bateau +observe.common.vesselSpeed=Vitesse bateau (nd) +observe.common.vesselType=Type de pêcherie +observe.common.waveHeight=Libellé Hauteur moyenne vagues +observe.common.weight=Poids (en t) +observe.common.weightCategory=Catégorie de poids +observe.common.weightLengthFormula=Relation Taille +observe.common.well=Cuve +observe.common.wind=Vent Beaufort +observe.common.wormsId=Worms +observe.common.yearService=Année de mise en service observe.type.activityLongline=Activité observe.type.activityLonglineEncounter=Rencontre observe.type.activityLonglineEncounters=Rencontres ===================================== test/src/main/resources/db/6.901/dataForTestLongline.sql.gz ===================================== Binary files a/test/src/main/resources/db/6.901/dataForTestLongline.sql.gz and b/test/src/main/resources/db/6.901/dataForTestLongline.sql.gz differ ===================================== test/src/main/resources/db/6.901/dataForTestSeine.sql.gz ===================================== Binary files a/test/src/main/resources/db/6.901/dataForTestSeine.sql.gz and b/test/src/main/resources/db/6.901/dataForTestSeine.sql.gz differ ===================================== test/src/main/resources/db/6.901/empty_h2.sql.gz ===================================== Binary files a/test/src/main/resources/db/6.901/empty_h2.sql.gz and b/test/src/main/resources/db/6.901/empty_h2.sql.gz differ ===================================== test/src/main/resources/db/6.901/empty_pg.sql.gz ===================================== Binary files a/test/src/main/resources/db/6.901/empty_pg.sql.gz and b/test/src/main/resources/db/6.901/empty_pg.sql.gz differ ===================================== test/src/main/resources/db/6.901/referentiel.sql.gz ===================================== Binary files a/test/src/main/resources/db/6.901/referentiel.sql.gz and b/test/src/main/resources/db/6.901/referentiel.sql.gz differ ===================================== toolbox-maven-plugin/src/main/java/fr/ird/observe/maven/plugins/toolbox/GenerateI18nValidatorFieldsMojo.java ===================================== --- a/toolbox-maven-plugin/src/main/java/fr/ird/observe/maven/plugins/toolbox/GenerateI18nValidatorFieldsMojo.java +++ b/toolbox-maven-plugin/src/main/java/fr/ird/observe/maven/plugins/toolbox/GenerateI18nValidatorFieldsMojo.java @@ -117,13 +117,13 @@ class GenerateI18nValidatorFieldsMojo extends GenerateValidatorMojoSupport { getLog().info("Generate to " + getOutputFile()); - List<String> compileSourceRoots = getProject().getCompileSourceRoots(); + List<String> compileSourceRoots = getProject().getTestCompileSourceRoots(); if (!compileSourceRoots.contains(outputDirectory.getAbsolutePath())) { - getLog().info("Add to compile source root: " + outputDirectory); + getLog().info("Add to test compile source root: " + outputDirectory); - getProject().addCompileSourceRoot(outputDirectory.getAbsolutePath()); + getProject().addTestCompileSourceRoot(outputDirectory.getAbsolutePath()); } Set<String> fields = new TreeSet<>(); View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/9397b4c723d582d402c5d2e3094... --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/9397b4c723d582d402c5d2e3094... You're receiving this email because of your account on gitlab.com.