This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit 47744bdd24568698663f3b1df0682fa61541b8fb Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Sep 4 15:56:17 2016 +0200 Use now observe.type instead of observe.common, clean up then decoration module --- .../swing/decoration/DecoratorService.java | 50 +++++++-- .../decoration/ObserveI18nDecoratorHelper.java | 41 +++++--- .../application-swing-decoration_en_GB.properties | 112 ++------------------ .../application-swing-decoration_es_ES.properties | 116 ++------------------- .../application-swing-decoration_fr_FR.properties | 116 ++------------------- 5 files changed, 95 insertions(+), 340 deletions(-) diff --git a/application-swing-decoration/src/main/java/fr/ird/observe/application/swing/decoration/DecoratorService.java b/application-swing-decoration/src/main/java/fr/ird/observe/application/swing/decoration/DecoratorService.java index 4c518fa..d60de67 100644 --- a/application-swing-decoration/src/main/java/fr/ird/observe/application/swing/decoration/DecoratorService.java +++ b/application-swing-decoration/src/main/java/fr/ird/observe/application/swing/decoration/DecoratorService.java @@ -123,9 +123,12 @@ import fr.ird.observe.util.GPSPoint; import org.nuiton.decorator.Decorator; import org.nuiton.decorator.DecoratorProvider; +import java.util.Collections; +import java.util.Comparator; +import java.util.HashMap; +import java.util.List; import java.util.Locale; -import java.util.regex.Matcher; -import java.util.regex.Pattern; +import java.util.Map; import static org.nuiton.i18n.I18n.l; import static org.nuiton.i18n.I18n.n; @@ -143,8 +146,8 @@ public class DecoratorService extends DecoratorProvider { // /** Logger */ // private static final Log log = LogFactory.getLog(DecoratorService.class); - /** Le pattern pour utiliser les clef i18n generees dans les entites */ - private static final Pattern LABEL_PATTERN = Pattern.compile("observe\\.common\\.(.+)"); +// /** Le pattern pour utiliser les clef i18n generees dans les entites */ +// private static final Pattern LABEL_PATTERN = Pattern.compile("observe\\.common\\.(.+)"); public static final String HAULING_IDENTIFIER = "haulingIdentifier"; @@ -166,9 +169,9 @@ public class DecoratorService extends DecoratorProvider { this.referentialLocale = referentialLocale; } - public Matcher getPropertyMatch(String regex) { - return LABEL_PATTERN.matcher(regex); - } +// public Matcher getPropertyMatch(String regex) { +// return LABEL_PATTERN.matcher(regex); +// } public String decorate(Object o) { return decorate(null, o); @@ -527,6 +530,10 @@ public class DecoratorService extends DecoratorProvider { } + public <T extends ReferentialDto> void sort(Class<T> type, List<ReferentialReference<T>> data) { + new ReferentialReferenceComparator<>(type).sort(data); + } + public <T extends ReferentialDto> ReferentialReferenceDecorator<T> getReferentialReferenceDecorator(Class<T> referenceType) { return (ReferentialReferenceDecorator<T>) (ReferentialReferenceDecorator) getDecoratorByType(ReferentialReference.class, referenceType.getSimpleName()); } @@ -624,4 +631,33 @@ public class DecoratorService extends DecoratorProvider { registerDecorator(context, new ObserveDecorator<>(referenceType, expression, separator)); } + private class ReferentialReferenceComparator<T extends ReferentialDto> implements Comparator<ReferentialReference<T>> { + + private final ReferentialReferenceDecorator<T> decorator; + + private final Map<ReferentialReference<T>, String> cache = new HashMap<>(); + + private ReferentialReferenceComparator(Class<T> type) { + decorator = getReferentialReferenceDecorator(type); + } + + private String get(ReferentialReference<T> id) { + String value = cache.get(id); + if (value == null) { + value = decorator.toString(id); + cache.put(id, value); + } + return value; + } + + @Override + public int compare(ReferentialReference<T> o1, ReferentialReference<T> o2) { + return get(o1).compareTo(get(o2)); + } + + public void sort(List<ReferentialReference<T>> data) { + Collections.sort(data, this); + cache.clear(); + } + } } diff --git a/application-swing-decoration/src/main/java/fr/ird/observe/application/swing/decoration/ObserveI18nDecoratorHelper.java b/application-swing-decoration/src/main/java/fr/ird/observe/application/swing/decoration/ObserveI18nDecoratorHelper.java index 138d301..06016a3 100644 --- a/application-swing-decoration/src/main/java/fr/ird/observe/application/swing/decoration/ObserveI18nDecoratorHelper.java +++ b/application-swing-decoration/src/main/java/fr/ird/observe/application/swing/decoration/ObserveI18nDecoratorHelper.java @@ -2,12 +2,17 @@ package fr.ird.observe.application.swing.decoration; import com.google.common.cache.AbstractLoadingCache; import fr.ird.observe.services.dto.ObserveDto; +import fr.ird.observe.util.ObserveUtil; import org.apache.commons.lang3.StringUtils; import org.atteo.evo.inflector.English; import java.beans.Introspector; +import java.util.Collection; +import java.util.List; import java.util.function.Function; +import static org.nuiton.i18n.I18n.t; + /** * Created on 03/09/16. * @@ -19,16 +24,30 @@ public class ObserveI18nDecoratorHelper { private static final String OBSERVE_COMMON_PREFIX = "observe.common."; private static final String OBSERVE_TYPE_PREFIX = "observe.type."; - public static String getTypeI18nKey(String name) { + public static List<Class> sortTypes(Collection<Class> types) { + return ObserveUtil.sortTypes(types, klass -> t(ObserveI18nDecoratorHelper.getTypeI18nKey(klass))); + } + + public static String getPropertyName(Class key) { + String name = key.getSimpleName(); name = StringUtils.removeEnd(name, "Dto"); - String propertyName = Introspector.decapitalize(name); - return OBSERVE_TYPE_PREFIX + Introspector.decapitalize(propertyName); + return Introspector.decapitalize(name); + } + + public static String getPlurialPropertyName(Class key) { + return English.plural(getPropertyName(key), 2); } public static String getTypeI18nKey(Class key) { return TYPE_CACHE.get(key); } + public static String getTypePlurialI18nKey(String name) { + name = StringUtils.removeEnd(name, "Dto"); + String propertyName = Introspector.decapitalize(name); + return OBSERVE_TYPE_PREFIX + English.plural(propertyName); + } + public static String getTypePlurialI18nKey(Class entityClass) { return TYPE_PLURALIZE_CACHE.get(entityClass); } @@ -41,21 +60,9 @@ public class ObserveI18nDecoratorHelper { return prefix + Introspector.decapitalize(propertyName); } - private static String getTypeI18nKey0(Class type) { - String entityClassName = StringUtils.removeEnd(type.getSimpleName(), "Dto"); - String propertyName = Introspector.decapitalize(entityClassName); - return OBSERVE_TYPE_PREFIX + Introspector.decapitalize(propertyName); - } - - private static String getTypePlurialI18nKey0(Class type) { - String entityClassName = StringUtils.removeEnd(type.getSimpleName(), "Dto"); - String propertyName = Introspector.decapitalize(entityClassName); - return OBSERVE_TYPE_PREFIX + English.plural(propertyName); - } - - private static final ClassToI18nKeyCache TYPE_CACHE = new ClassToI18nKeyCache(ObserveI18nDecoratorHelper::getTypeI18nKey0); + private static final ClassToI18nKeyCache TYPE_CACHE = new ClassToI18nKeyCache(type -> OBSERVE_TYPE_PREFIX + getPropertyName(type)); - private static final ClassToI18nKeyCache TYPE_PLURALIZE_CACHE = new ClassToI18nKeyCache(ObserveI18nDecoratorHelper::getTypePlurialI18nKey0); + private static final ClassToI18nKeyCache TYPE_PLURALIZE_CACHE = new ClassToI18nKeyCache(type -> OBSERVE_TYPE_PREFIX + getPlurialPropertyName(type)); private static class ClassToI18nKeyCache extends AbstractLoadingCache<Class, String> { diff --git a/application-swing-decoration/src/main/resources/i18n/application-swing-decoration_en_GB.properties b/application-swing-decoration/src/main/resources/i18n/application-swing-decoration_en_GB.properties index ecd2bb9..156bf6f 100644 --- a/application-swing-decoration/src/main/resources/i18n/application-swing-decoration_en_GB.properties +++ b/application-swing-decoration/src/main/resources/i18n/application-swing-decoration_en_GB.properties @@ -1,72 +1,14 @@ -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.basket=Basket -observe.common.branchline=Branchline -observe.common.branchlineLength=Branchline length -observe.common.branchlinesComposition=Branchlines composition -observe.common.catchFateLongline=Catch fate -observe.common.catchLongline=Catch -observe.common.country=Country -observe.common.detectionMode=Detection mode -observe.common.encounter=Encounter -observe.common.encounterType=Encounter type observe.common.faoCode=Fao code -observe.common.floatingObject=Floating object -observe.common.floatline1Length=Floatine 1 length -observe.common.floatline2Length=Floatine 2 length -observe.common.floatlineLengths=Floatine lengths -observe.common.floatlinesComposition=Floatines composition -observe.common.fpaZone=Fpa zone -observe.common.gear=Gear -observe.common.gearCaracteristic=Gear caracteristic -observe.common.gearCaracteristicType=Gear caracteristic type -observe.common.gearUseFeaturesLongline=Gear uses features -observe.common.gearUseFeaturesMeasurementLongline=Gear uses feature measurements -observe.common.gearUseFeaturesMeasurementSeine=Gear uses feature measurements -observe.common.gearUseFeaturesSeine=Gear uses features -observe.common.gender=Sex observe.common.gps.activity=Activity observe.common.gps.gpsPoint=Gps point -observe.common.harbour=Harbour observe.common.haulingIdentifier=Hauling identifier -observe.common.healthness=Healthness observe.common.homeId=Home id -observe.common.hookPosition=Hook position -observe.common.hookSize=Hook size -observe.common.hookType=Hook type -observe.common.hooksComposition=Hooks composition -observe.common.id=Id observe.common.inconnu=Unknown -observe.common.itemHorizontalPosition=Item horizontal position -observe.common.itemVerticalPosition=Item vertical position observe.common.label=Label observe.common.lengthWeightFormula=Length weight formula -observe.common.lengthWeightParameter=Length weight parameter -observe.common.lightsticksColor=Lightsticks color -observe.common.lightsticksType=Lightsticks type -observe.common.lineType=Line type -observe.common.locode=Locode -observe.common.longlineDetailComposition=Detailed composition -observe.common.maturityStatus=Maturity status -observe.common.mitigationType=Mitigation type -observe.common.name=Name observe.common.nocode=Nocode -observe.common.nonTargetCatch=Non target catch -observe.common.nonTargetLength=Non target length -observe.common.nonTargetSample=Non target sample observe.common.none=None -observe.common.objectFate=Object fate -observe.common.objectObservedSpecies=Object observed species -observe.common.objectOperation=Object operation -observe.common.objectSchoolEstimate=Object school estimate -observe.common.objectType=Object type -observe.common.observedSystem=Observed system observe.common.observerLabel=Observer label -observe.common.ocean=Ocean observe.common.ocean/label1=Ocean observe.common.ocean/label2=Ocean observe.common.ocean/label3=Ocean @@ -75,50 +17,13 @@ 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.person=Person observe.common.program=Program -observe.common.reasonForDiscard=Reason for discard -observe.common.reasonForNoFishing=Reason for no fishing -observe.common.reasonForNullSet=Reason for null set -observe.common.route=Route -observe.common.schoolEstimate=School estimate observe.common.scientificLabel=Scientific label -observe.common.section=Section -observe.common.sensorBrand=SensorBrand -observe.common.sensorDataFormat=Sensor data format -observe.common.sensorPosition=Sensor position -observe.common.sensorType=Sensor type -observe.common.sensorUsed=Sensor used observe.common.setLongline=Set observe.common.setSeine=Set observe.common.settingIdentifier=Setting -observe.common.settingShape=Setting shape observe.common.sex=Sex -observe.common.sizeMeasure=Size measure -observe.common.sizeMeasureType=Size measure type -observe.common.species=Species observe.common.species/scientificLabel=Scientific label -observe.common.speciesFate=Species fate -observe.common.speciesGroup=Species group -observe.common.speciesList=Species list -observe.common.speciesStatus=Species status -observe.common.stomacFullness=Stomac fullness -observe.common.surroundingActivity=Surrounding activity -observe.common.targetCatch=Target catch -observe.common.targetLength=Target length -observe.common.targetSample=Target sample -observe.common.tdr=Tdr -observe.common.tdrRecord=Tdr record -observe.common.time=Time -observe.common.tracelineLength=Traceline length -observe.common.transmittingBuoy=Transmitting buoy -observe.common.transmittingBuoyOperation=Transmitting buoy operation -observe.common.transmittingBuoyType=Transmitting buoy type -observe.common.tripLongline=Trip -observe.common.tripSeine=Trip -observe.common.tripType=Trip type -observe.common.vessel=Vessel observe.common.vessel/label1=Vessel observe.common.vessel/label2=Vessel observe.common.vessel/label3=Vessel @@ -127,8 +32,6 @@ 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 @@ -137,12 +40,6 @@ 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.vesselType=Vessel type -observe.common.weightCategory=Weight category -observe.common.weightMeasure=Weight measure -observe.common.weightMeasureType=Weight measure type -observe.common.wind=Wind observe.type.activityLongline=Activity observe.type.activityLonglineEncounter=Encounter observe.type.activityLonglineEncounters=Encounters @@ -175,6 +72,10 @@ observe.type.countries=Countrys observe.type.country=Country observe.type.detectionMode=Detection mode observe.type.detectionModes=Detections mode +observe.type.discardedTargetCatch=Discarded target catch +observe.type.discardedTargetCatches=Discarded target catches +observe.type.discardedTargetSample=Discarded target sample +observe.type.discardedTargetSamples=Discarded target samples observe.type.encounter=Encounter observe.type.encounterType=Encounter type observe.type.encounterTypes=Encounters type @@ -220,6 +121,10 @@ observe.type.itemHorizontalPosition=Item horizontal position observe.type.itemHorizontalPositions=Items horizontal position observe.type.itemVerticalPosition=Item vertical position observe.type.itemVerticalPositions=Items vertical position +observe.type.keptTargetCatch=Target catch +observe.type.keptTargetCatches=Target catches +observe.type.keptTargetSample=Target sample +observe.type.keptTargetSamples=Target samples observe.type.lengthWeightParameter=Length weight parameter observe.type.lengthWeightParameters=Lengths weight parameter observe.type.lightsticksColor=Lightsticks color @@ -312,7 +217,6 @@ observe.type.speciesList=Species list observe.type.speciesLists=Speciess list observe.type.speciesStatus=Species status observe.type.speciesStatuses=Speciess status -observe.type.speciess=Speciess observe.type.stomacFullness=Stomac fullness observe.type.stomacFullnesses=Stomacs fullness observe.type.surroundingActivities=Surroundings activity diff --git a/application-swing-decoration/src/main/resources/i18n/application-swing-decoration_es_ES.properties b/application-swing-decoration/src/main/resources/i18n/application-swing-decoration_es_ES.properties index 4d5c36f..31c882a 100644 --- a/application-swing-decoration/src/main/resources/i18n/application-swing-decoration_es_ES.properties +++ b/application-swing-decoration/src/main/resources/i18n/application-swing-decoration_es_ES.properties @@ -1,72 +1,14 @@ -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=Composición de los cebos -observe.common.basket=Cesta -observe.common.branchline=Arponcillo -observe.common.branchlineLength=Arponcillo (m) -observe.common.branchlinesComposition=Composición de los arponcillos -observe.common.catchFateLongline=Futuro de la captura -observe.common.catchLongline=Captura -observe.common.country=País -observe.common.detectionMode=Modo de detección -observe.common.encounter=Encuentro -observe.common.encounterType=Tipo de encuentro observe.common.faoCode=Codigo FAO -observe.common.floatingObject=Objeto flotante -observe.common.floatline1Length=Orinque 1 (m) -observe.common.floatline2Length=Orinque 2 (m) -observe.common.floatlineLengths=Template -observe.common.floatlinesComposition=Composición de los orinques -observe.common.fpaZone=Zona FPA -observe.common.gear=Equipamiento -observe.common.gearCaracteristic=Característica de un equipamiento -observe.common.gearCaracteristicType=Tipo de característica de equipamientos -observe.common.gearUseFeaturesLongline=Equipamiento -observe.common.gearUseFeaturesMeasurementLongline=Medida -observe.common.gearUseFeaturesMeasurementSeine=Medida -observe.common.gearUseFeaturesSeine=Equipamiento -observe.common.gender=Sexo observe.common.gps.activity=Actividad observe.common.gps.gpsPoint=Punto GPS -observe.common.harbour=Puerto observe.common.haulingIdentifier=Arrastre -observe.common.healthness=Estado de salud observe.common.homeId=Identificador -observe.common.hookPosition=Posición del anzuelo -observe.common.hookSize=Tamaño -observe.common.hookType=Tipo de anzuelo -observe.common.hooksComposition=Composición de los anzuelos -observe.common.id=Identificador observe.common.inconnu=desconocido -observe.common.itemHorizontalPosition=Localización del elemento sobre la línea principal -observe.common.itemVerticalPosition=Localización del elemento sobre el arponcillo observe.common.label=Título observe.common.lengthWeightFormula=Relación Peso -observe.common.lengthWeightParameter=Relación Tamaño-Peso -observe.common.lightsticksColor=Color de barrita de luz -observe.common.lightsticksType=Tipo de barrita de luz -observe.common.lineType=Tipo de línea -observe.common.locode=Locode -observe.common.longlineDetailComposition=Composición detallada -observe.common.maturityStatus=Maturidad -observe.common.mitigationType=Tipo de medida de atenuación -observe.common.name=Nombre observe.common.nocode=codigo ausente -observe.common.nonTargetCatch=Fauna accesoria conservada o descartada -observe.common.nonTargetLength=Longitud (cm inf.) -observe.common.nonTargetSample=Muestreo de fauna accesoria observe.common.none=Ninguno -observe.common.objectFate=Futuro del objeto -observe.common.objectObservedSpecies=Fauna observada -observe.common.objectOperation=Operación sobre el objeto -observe.common.objectSchoolEstimate=Estimación banco de objetos -observe.common.objectType=Tipo de objeto -observe.common.observedSystem=Système observé observe.common.observerLabel=Observador -observe.common.ocean=Oceano observe.common.ocean/label1=Oceano observe.common.ocean/label2=Oceano observe.common.ocean/label3=Oceano @@ -75,50 +17,13 @@ observe.common.ocean/label5=Oceano observe.common.ocean/label6=Oceano observe.common.ocean/label7=Oceano observe.common.ocean/label8=Oceano -observe.common.organism=Organismo -observe.common.person=Persona observe.common.program=Programa -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.route=Ruta -observe.common.schoolEstimate=Estimación banco observe.common.scientificLabel=Título científico -observe.common.section=Sección -observe.common.sensorBrand=Marca de sensor -observe.common.sensorDataFormat=Formato de los datos del sensor -observe.common.sensorPosition=Posición del sensor -observe.common.sensorType=Tipo de sensor -observe.common.sensorUsed=Sensor utilizado observe.common.setLongline=Operación de pesca observe.common.setSeine=Lance observe.common.settingIdentifier=Calada -observe.common.settingShape=Forma en al calada observe.common.sex=Sexo -observe.common.sizeMeasure=Medida del tamaño -observe.common.sizeMeasureType=Tipo de medida del tamaño -observe.common.species=Especie observe.common.species/scientificLabel=Especie -observe.common.speciesFate=Futuro de la especie -observe.common.speciesGroup=Grupo de especie -observe.common.speciesList=Lista de especies -observe.common.speciesStatus=Estatuto de la fauna observada -observe.common.stomacFullness=Nivel de llenado del estomago -observe.common.surroundingActivity=Actividad circundante -observe.common.targetCatch=Captura destinataria -observe.common.targetLength=Tamaño del atún -observe.common.targetSample=Muestreo del atún descartado -observe.common.tdr=Registrador de profundidad -observe.common.tdrRecord=Registración de profundidad -observe.common.time=Hora -observe.common.tracelineLength=Parte baja (m) -observe.common.transmittingBuoy=Baliza leida -observe.common.transmittingBuoyOperation=Operación baliza -observe.common.transmittingBuoyType=Tipo de baliza -observe.common.tripLongline=Marea -observe.common.tripSeine=Marea -observe.common.tripType=Tipo de marea -observe.common.vessel=Buque observe.common.vessel/label1=Buque observe.common.vessel/label2=Buque observe.common.vessel/label3=Buque @@ -127,8 +32,6 @@ 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 @@ -137,12 +40,6 @@ 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=Categoría de buque -observe.common.vesselType=Tipo de pesquería -observe.common.weightCategory=Categoría de peso -observe.common.weightMeasure=Medida de peso -observe.common.weightMeasureType=Tipo de medida de peso -observe.common.wind=Viento Beaufort observe.type.activityLongline=Actividad observe.type.activityLonglineEncounter=TODO observe.type.activityLonglineEncounters=TODO @@ -175,6 +72,10 @@ observe.type.countries=País TODO observe.type.country=País observe.type.detectionMode=Modo de detección observe.type.detectionModes=Modo de detección TODO +observe.type.discardedTargetCatch=Descarte de atún +observe.type.discardedTargetCatches=Descarte de atún TODO +observe.type.discardedTargetSample=Muestreo del atún descartado +observe.type.discardedTargetSamples=Muestreo del atún descartado TODO observe.type.encounter=Encuentro observe.type.encounterType=Tipo de encuentro observe.type.encounterTypes=Tipo de encuentro TODO @@ -220,6 +121,10 @@ observe.type.itemHorizontalPosition=Localización del elemento sobre la línea p observe.type.itemHorizontalPositions=Localización del elemento sobre la línea principal TODO observe.type.itemVerticalPosition=Localización del elemento sobre el arponcillo observe.type.itemVerticalPositions=Localización del elemento sobre el arponcillo TODO +observe.type.keptTargetCatch=Captura de atún +observe.type.keptTargetCatches=Captura de atún TODO +observe.type.keptTargetSample=Muestreo de atún capturado +observe.type.keptTargetSamples=Muestreo de atún capturado TODO observe.type.lengthWeightParameter=Relación Tamaño-Peso observe.type.lengthWeightParameters=Relación Tamaño-Peso TODO observe.type.lightsticksColor=Color de barrita de luz @@ -312,7 +217,6 @@ observe.type.speciesList=Lista de especies observe.type.speciesLists=Lista de especies TODO observe.type.speciesStatus=Estatuto de la fauna observada observe.type.speciesStatuses=Estatuto de la fauna observada TODO -observe.type.speciess=Especie TODO observe.type.stomacFullness=Nivel de llenado del estomago observe.type.stomacFullnesses=Nivel de llenado del estomago TODO observe.type.surroundingActivities=Actividad circundante TODO @@ -321,8 +225,8 @@ observe.type.targetCatch=Captura destinataria observe.type.targetCatches=Captura destinataria TODO observe.type.targetLength=Tamaño del atún observe.type.targetLengths=Tamaño del atún TODO -observe.type.targetSample=Muestreo del atún descartado -observe.type.targetSamples=Muestreo del atún descartado TODO +observe.type.targetSample=Muestreo del atún +observe.type.targetSamples=Muestreo del atún TODO observe.type.tdr=Registrador de profundidad observe.type.tdrs=Registrador de profundidad TODO observe.type.transmittingBuoy=Baliza leida diff --git a/application-swing-decoration/src/main/resources/i18n/application-swing-decoration_fr_FR.properties b/application-swing-decoration/src/main/resources/i18n/application-swing-decoration_fr_FR.properties index 14b18c4..4d9bc63 100644 --- a/application-swing-decoration/src/main/resources/i18n/application-swing-decoration_fr_FR.properties +++ b/application-swing-decoration/src/main/resources/i18n/application-swing-decoration_fr_FR.properties @@ -1,72 +1,14 @@ -observe.common.activityLongline=Activité -observe.common.activitySeine=Activité -observe.common.baitHaulingStatus=Statut de l'appât au virage -observe.common.baitSettingStatus=Statut de l'appât au filage -observe.common.baitType=Type d'appât -observe.common.baitsComposition=Composition des appâts -observe.common.basket=Basket -observe.common.branchline=Avançon -observe.common.branchlineLength=Avançon (m) -observe.common.branchlinesComposition=Composition des avançons -observe.common.catchFateLongline=Devenir capture -observe.common.catchLongline=Capture -observe.common.country=Pays -observe.common.detectionMode=Mode détection -observe.common.encounter=Rencontre -observe.common.encounterType=Type de rencontre observe.common.faoCode=Code FAO -observe.common.floatingObject=Objet flottant -observe.common.floatline1Length=Orin 1 (m) -observe.common.floatline2Length=Orin 2 (m) -observe.common.floatlineLengths=Template -observe.common.floatlinesComposition=Composition des orins -observe.common.fpaZone=Zone FPA -observe.common.gear=Équipement -observe.common.gearCaracteristic=Caractéristique d'un équipement -observe.common.gearCaracteristicType=Type de caractéristique d'équipement -observe.common.gearUseFeaturesLongline=Équipement -observe.common.gearUseFeaturesMeasurementLongline=Mesure -observe.common.gearUseFeaturesMeasurementSeine=Mesure -observe.common.gearUseFeaturesSeine=Équipement -observe.common.gender=Sexe observe.common.gps.activity=Activité observe.common.gps.gpsPoint=Point GPS -observe.common.harbour=Port observe.common.haulingIdentifier=Virage -observe.common.healthness=État de santé observe.common.homeId=Identifiant -observe.common.hookPosition=Position du hameçon -observe.common.hookSize=Taille -observe.common.hookType=Type d'hameçon -observe.common.hooksComposition=Composition des hameçons -observe.common.id=Identifiant observe.common.inconnu=inconnu -observe.common.itemHorizontalPosition=Localisation de l'élément sur la ligne mère -observe.common.itemVerticalPosition=Localisation de l'élément sur l'avançon observe.common.label=Libellé observe.common.lengthWeightFormula=Relation Poids -observe.common.lengthWeightParameter=Relation Taille-Poids -observe.common.lightsticksColor=Couleur de baton lumineux -observe.common.lightsticksType=Type de baton lumineux -observe.common.lineType=Type de ligne -observe.common.locode=Locode -observe.common.longlineDetailComposition=Composition détaillée -observe.common.maturityStatus=Maturité -observe.common.mitigationType=Type de mesure d'atténuation -observe.common.name=Nom observe.common.nocode=code absent -observe.common.nonTargetCatch=Faune accessoire conservée ou rejetée -observe.common.nonTargetLength=Longueur (cm inf.) -observe.common.nonTargetSample=Echantillon faune accessoire observe.common.none=Aucun -observe.common.objectFate=Devenir de l'objet -observe.common.objectObservedSpecies=Faune observée -observe.common.objectOperation=Opération sur l'objet -observe.common.objectSchoolEstimate=Estimation banc objet -observe.common.objectType=Type d'objet -observe.common.observedSystem=Système observé 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 @@ -75,50 +17,13 @@ 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.person=Personne observe.common.program=Programme -observe.common.reasonForDiscard=Raison rejet -observe.common.reasonForNoFishing=Raison de non coup de Senne -observe.common.reasonForNullSet=Cause coup nul -observe.common.route=Route -observe.common.schoolEstimate=Estimation banc observe.common.scientificLabel=Libellé scientifique -observe.common.section=Section -observe.common.sensorBrand=Marque de capteur -observe.common.sensorDataFormat=Format de données de capteur -observe.common.sensorPosition=Position de capteur -observe.common.sensorType=Type de capteur -observe.common.sensorUsed=Capteur utilisé observe.common.setLongline=Opération de pêche observe.common.setSeine=Calée observe.common.settingIdentifier=Filage -observe.common.settingShape=Forme au filage observe.common.sex=Sexe -observe.common.sizeMeasure=Mesure de taille -observe.common.sizeMeasureType=Type de mesure de taille -observe.common.species=Espèce observe.common.species/scientificLabel=Espèce -observe.common.speciesFate=Devenir espèce -observe.common.speciesGroup=Groupe espèce -observe.common.speciesList=Liste d'espèces -observe.common.speciesStatus=Statut faune observée -observe.common.stomacFullness=Niveau de remplissage de l'estomac -observe.common.surroundingActivity=Activité environnante -observe.common.targetCatch=Capture cible -observe.common.targetLength=Taille Thon -observe.common.targetSample=Echantillon thon rejeté -observe.common.tdr=Enregistreur de profondeur -observe.common.tdrRecord=Enregistrement de profondeur -observe.common.time=Heure -observe.common.tracelineLength=Partie basse (m) -observe.common.transmittingBuoy=Balise lue -observe.common.transmittingBuoyOperation=Opération balise -observe.common.transmittingBuoyType=Type de balise -observe.common.tripLongline=Marée -observe.common.tripSeine=Marée -observe.common.tripType=Type de marée -observe.common.vessel=Bateau observe.common.vessel/label1=Bateau observe.common.vessel/label2=Bateau observe.common.vessel/label3=Bateau @@ -127,8 +32,6 @@ 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 @@ -137,12 +40,6 @@ 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.vesselType=Type de pêcherie -observe.common.weightCategory=Catégorie de poids -observe.common.weightMeasure=Mesure de poids -observe.common.weightMeasureType=Type de mesure de poids -observe.common.wind=Vent Beaufort observe.type.activityLongline=Activité observe.type.activityLonglineEncounter=Rencontre observe.type.activityLonglineEncounters=Rencontres @@ -175,6 +72,10 @@ observe.type.countries=Payss observe.type.country=Pays observe.type.detectionMode=Mode détection observe.type.detectionModes=Modes détection +observe.type.discardedTargetCatch=Rejet de thon +observe.type.discardedTargetCatches=Rejets de thon +observe.type.discardedTargetSample=Echantillon thon rejeté +observe.type.discardedTargetSamples=Echantillons thon rejetés observe.type.encounter=Rencontre observe.type.encounterType=Type de rencontre observe.type.encounterTypes=Types de rencontre @@ -220,6 +121,10 @@ observe.type.itemHorizontalPosition=Localisation de l'élément sur la ligne mè observe.type.itemHorizontalPositions=Localisations de l'élément sur la ligne mère observe.type.itemVerticalPosition=Localisation de l'élément sur l'avançon observe.type.itemVerticalPositions=Localisations de l'élément sur l'avançon +observe.type.keptTargetCatch=Capture cible +observe.type.keptTargetCatches=Captures cible +observe.type.keptTargetSample=Echantillon thon capturé +observe.type.keptTargetSamples=Echantillons thon capturés observe.type.lengthWeightParameter=Relation Taille-Poids observe.type.lengthWeightParameters=Relations Taille-Poids observe.type.lightsticksColor=Couleur de baton lumineux @@ -312,7 +217,6 @@ observe.type.speciesList=Liste d'espèces observe.type.speciesLists=Listes d'espèces observe.type.speciesStatus=Statut faune observée observe.type.speciesStatuses=Statuts faune observée -observe.type.speciess=Espèces observe.type.stomacFullness=Niveau de remplissage de l'estomac observe.type.stomacFullnesses=Niveaus de remplissage de l'estomac observe.type.surroundingActivities=Activités environnante @@ -321,8 +225,8 @@ observe.type.targetCatch=Capture cible observe.type.targetCatches=Captures cible observe.type.targetLength=Taille Thon observe.type.targetLengths=Tailles Thon -observe.type.targetSample=Echantillon thon rejeté -observe.type.targetSamples=Echantillons thon rejeté +observe.type.targetSample=Echantillon thon +observe.type.targetSamples=Echantillons thon observe.type.tdr=Enregistreur de profondeur observe.type.tdrs=Enregistreurs de profondeur observe.type.transmittingBuoy=Balise lue -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.