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 7a27847a47c6f3622fcf92f095babb902530f805 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Aug 28 16:26:12 2016 +0200 Use I18n new mojo to generate i18n for enums --- observe-application-swing/pom.xml | 25 +++++ .../swing/ui/content/ContentUIInitializer.java | 12 +-- .../ui/content/impl/seine/SetSeineUIHandler.java | 14 +-- .../application/swing/ui/util/I18nEnumUtil.java | 101 --------------------- .../ui/util/tripMap/TripMapContentBuilder.java | 19 ++-- .../observe-application-swing_en_GB.properties | 34 +++++++ .../observe-application-swing_es_ES.properties | 34 +++++++ .../observe-application-swing_fr_FR.properties | 68 +++++++------- pom.xml | 6 +- 9 files changed, 152 insertions(+), 161 deletions(-) diff --git a/observe-application-swing/pom.xml b/observe-application-swing/pom.xml index 403d001..766899c 100644 --- a/observe-application-swing/pom.xml +++ b/observe-application-swing/pom.xml @@ -405,6 +405,24 @@ <artifactId>i18n-maven-plugin</artifactId> <executions> <execution> + <id>generateI18nEnumHelper</id> + <goals> + <goal>generateI18nEnumHelper</goal> + </goals> + <configuration> + <prefix>observe.enum.</prefix> + <enums> + <enum>fr.ird.observe.services.dto.constants.GearType</enum> + <enum>fr.ird.observe.services.dto.constants.ReferenceStatus</enum> + <enum>fr.ird.observe.services.dto.constants.TripMapPointType</enum> + <enum>fr.ird.observe.services.dto.constants.seine.SchoolType</enum> + <enum>fr.ird.observe.services.dto.constants.seine.TypeTransmittingBuoyOperation</enum> + <enum>fr.ird.observe.services.dto.constants.seine.Ownership</enum> + <enum>fr.ird.observe.services.dto.constants.seine.NonTargetCatchComputedValueSource</enum> + </enums> + </configuration> + </execution> + <execution> <id>scan-sources</id> <goals> <goal>parserJava</goal> @@ -435,6 +453,13 @@ </goals> </execution> </executions> + <dependencies> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>observe-services-api</artifactId> + <version>${project.version}</version> + </dependency> + </dependencies> </plugin> <plugin> diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIInitializer.java b/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIInitializer.java index 23e5b6d..4b40d64 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIInitializer.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIInitializer.java @@ -28,6 +28,11 @@ import fr.ird.observe.application.swing.ObserveSwingApplicationContext; import fr.ird.observe.application.swing.decoration.DecoratorService; import fr.ird.observe.application.swing.decoration.decorators.DataReferenceDecorator; import fr.ird.observe.application.swing.decoration.decorators.ReferentialReferenceDecorator; +import fr.ird.observe.application.swing.ui.actions.shared.AbstractUIAction; +import fr.ird.observe.application.swing.ui.util.BooleanEditor; +import fr.ird.observe.application.swing.ui.util.tripMap.ObserveMapPane; +import fr.ird.observe.application.swing.validation.ObserveSwingValidator; +import fr.ird.observe.observe.application.swing.I18nEnumHelper; import fr.ird.observe.services.dto.AbstractReference; import fr.ird.observe.services.dto.DataDto; import fr.ird.observe.services.dto.DataReference; @@ -35,11 +40,6 @@ import fr.ird.observe.services.dto.Form; import fr.ird.observe.services.dto.IdDto; import fr.ird.observe.services.dto.referential.ReferentialDto; import fr.ird.observe.services.dto.referential.ReferentialReference; -import fr.ird.observe.application.swing.ui.util.I18nEnumUtil; -import fr.ird.observe.application.swing.ui.actions.shared.AbstractUIAction; -import fr.ird.observe.application.swing.ui.util.BooleanEditor; -import fr.ird.observe.application.swing.ui.util.tripMap.ObserveMapPane; -import fr.ird.observe.application.swing.validation.ObserveSwingValidator; import jaxx.runtime.JAXXValidator; import jaxx.runtime.SwingUtil; import jaxx.runtime.swing.JAXXWidgetUtil; @@ -551,7 +551,7 @@ public class ContentUIInitializer<E extends IdDto, UI extends ObserveContentUI<E } ImmutableMap.Builder<B, String> labelsBuilder = ImmutableMap.builder(); for (B e : EnumSet.allOf(editor.getType())) { - String label = I18nEnumUtil.getLabel(e); + String label = I18nEnumHelper.getLabel(e); labelsBuilder.put(e, label); } editor.setRenderer(new EnumEditorRenderer<>(labelsBuilder.build())); diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/SetSeineUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/SetSeineUIHandler.java index 7d898ed..b771333 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/SetSeineUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/SetSeineUIHandler.java @@ -25,6 +25,12 @@ import fr.ird.observe.application.swing.ObserveSwingApplicationContext; import fr.ird.observe.application.swing.db.DataContext; import fr.ird.observe.application.swing.db.ObserveSwingDataSource; import fr.ird.observe.application.swing.db.constants.DataContextType; +import fr.ird.observe.application.swing.ui.content.ContentMode; +import fr.ird.observe.application.swing.ui.content.ContentUIHandler; +import fr.ird.observe.application.swing.ui.content.ContentUIModel; +import fr.ird.observe.application.swing.ui.tree.ObserveNode; +import fr.ird.observe.application.swing.ui.tree.ObserveTreeHelper; +import fr.ird.observe.observe.application.swing.I18nEnumHelper; import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.Form; import fr.ird.observe.services.dto.constants.seine.SchoolType; @@ -35,12 +41,6 @@ import fr.ird.observe.services.dto.seine.SetSeineDto; import fr.ird.observe.services.dto.seine.SetSeineDtos; import fr.ird.observe.services.service.seine.RouteService; import fr.ird.observe.services.service.seine.SetSeineService; -import fr.ird.observe.application.swing.ui.util.I18nEnumUtil; -import fr.ird.observe.application.swing.ui.content.ContentMode; -import fr.ird.observe.application.swing.ui.content.ContentUIHandler; -import fr.ird.observe.application.swing.ui.content.ContentUIModel; -import fr.ird.observe.application.swing.ui.tree.ObserveNode; -import fr.ird.observe.application.swing.ui.tree.ObserveTreeHelper; import jaxx.runtime.swing.HidorButton; import jaxx.runtime.validator.swing.SwingValidatorMessage; import jaxx.runtime.validator.swing.SwingValidatorMessageTableModel; @@ -98,7 +98,7 @@ public class SetSeineUIHandler extends ContentUIHandler<SetSeineDto> { if (schoolType == null) { return t("observe.content.setSeine.schoolType.not.fill"); } - return I18nEnumUtil.getLabel(schoolType); + return I18nEnumHelper.getLabel(schoolType); } @Override diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/I18nEnumUtil.java b/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/I18nEnumUtil.java deleted file mode 100644 index 8778375..0000000 --- a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/I18nEnumUtil.java +++ /dev/null @@ -1,101 +0,0 @@ -package fr.ird.observe.application.swing.ui.util; - -/*- - * #%L - * ObServe :: Services API - * %% - * Copyright (C) 2008 - 2016 IRD, Codelutin, Tony Chemit - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * #L% - */ - -import java.beans.Introspector; -import java.util.Locale; - -import static org.nuiton.i18n.I18n.l; -import static org.nuiton.i18n.I18n.n; -import static org.nuiton.i18n.I18n.t; - -/** - * Pour gérer les traductions des énumérations (qu'elles viennent de la persistence ou du modèle de service). - * - * Created on 08/03/16. - * - * @author Tony Chemit - chemit@codelutin.com - */ -public class I18nEnumUtil { - - static { - - n("observe.enum.schoolType.undefined"); - n("observe.enum.schoolType.objet"); - n("observe.enum.schoolType.libre"); - - n("observe.enum.typeTransmittingBuoyOperation.pasDeBalise"); - n("observe.enum.typeTransmittingBuoyOperation.visite"); - n("observe.enum.typeTransmittingBuoyOperation.recuperation"); - n("observe.enum.typeTransmittingBuoyOperation.pose"); - n("observe.enum.typeTransmittingBuoyOperation.recuperationEtRemplacement"); - - n("observe.enum.ownership.unknown"); - n("observe.enum.ownership.ceVessel"); - n("observe.enum.ownership.autreVessel"); - - n("observe.enum.nonTargetCatchComputedValueSource.fromData"); - n("observe.enum.nonTargetCatchComputedValueSource.fromSample"); - n("observe.enum.nonTargetCatchComputedValueSource.fromReferentiel"); - - n("observe.enum.gearType.longline"); - n("observe.enum.gearType.seine"); - - n("observe.enum.referenceStatus.enabled"); - n("observe.enum.referenceStatus.disabled"); - - n("observe.enum.tripMapPointType.seineDepartureHarbour"); - n("observe.enum.tripMapPointType.seineLandingHarbour"); - n("observe.enum.tripMapPointType.seineActivity"); - n("observe.enum.tripMapPointType.seineActivityInHarbour"); - n("observe.enum.tripMapPointType.seineActivityWithFreeSchoolType"); - n("observe.enum.tripMapPointType.seineActivityWithObjectSchoolType"); - n("observe.enum.tripMapPointType.longlineActivity"); - n("observe.enum.tripMapPointType.longlineDepartureHarbour"); - n("observe.enum.tripMapPointType.longlineLandingHarbour"); - n("observe.enum.tripMapPointType.longlineActivityInHarbour"); - n("observe.enum.tripMapPointType.longlineActivityWithSettingStart"); - n("observe.enum.tripMapPointType.longlineActivityWithSettingEnd"); - n("observe.enum.tripMapPointType.longlineActivityWithHaulingStart"); - n("observe.enum.tripMapPointType.longlineActivityWithHaulingEnd"); - n("observe.enum.tripMapPointType.longlineActivityWithInteraction"); - n("observe.enum.tripMapPointType.longlineActivityWithStation"); - - } - - public static <E extends Enum<E>> String getLabel(E e) { - return t(getLabelKey(e)); - } - - public static <E extends Enum<E>> String getLabel(Locale locale, E e) { - return l(locale, getLabelKey(e)); - } - - protected static <E extends Enum<E>> String getLabelKey(E e) { - String simpleName = e.getClass().getSimpleName(); - simpleName = simpleName.replace("Persist", ""); - - return "observe.enum." + Introspector.decapitalize(simpleName) + "." + e.name(); - } - -} diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/tripMap/TripMapContentBuilder.java b/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/tripMap/TripMapContentBuilder.java index 42b8786..50d3307 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/tripMap/TripMapContentBuilder.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/tripMap/TripMapContentBuilder.java @@ -31,9 +31,9 @@ import com.vividsolutions.jts.geom.LineString; import com.vividsolutions.jts.geom.Point; import com.vividsolutions.jts.geom.Polygon; import fr.ird.observe.application.swing.ObserveSwingTechnicalException; +import fr.ird.observe.observe.application.swing.I18nEnumHelper; import fr.ird.observe.services.dto.TripMapPointDto; import fr.ird.observe.services.dto.constants.TripMapPointType; -import fr.ird.observe.application.swing.ui.util.I18nEnumUtil; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.time.DateUtils; import org.geotools.data.FileDataStore; @@ -195,7 +195,7 @@ public class TripMapContentBuilder { Style styleLines = findStyle(styledLayerDescriptor, TRIP_LINES_LAYER_NAME, null); - if (! linesFeatures.isEmpty()) { + if (!linesFeatures.isEmpty()) { Layer layerLines = new FeatureLayer(linesFeatures, styleLines, TRIP_LINES_LAYER_NAME); mapContent.addLayer(layerLines); } @@ -309,7 +309,7 @@ public class TripMapContentBuilder { defaultLineCoordinates.clear(); } - if (! (tripMapPoints.get(indexPoint).getType().equals(TripMapPointType.longlineActivityWithSettingEnd) + if (!(tripMapPoints.get(indexPoint).getType().equals(TripMapPointType.longlineActivityWithSettingEnd) || tripMapPoints.get(indexPoint).getType().equals(TripMapPointType.longlineActivityWithHaulingStart))) { defaultLineCoordinates.add(new Coordinate(tripMapPoints.get(indexPoint).getLongitude(), tripMapPoints.get(indexPoint).getLatitude())); @@ -317,9 +317,9 @@ public class TripMapContentBuilder { } if ((tripMapPoints.get(indexPoint).getType().equals(TripMapPointType.longlineActivityWithSettingStart) - || indexPoint == tripMapPoints.size() - 1) && defaultLineCoordinates.size() > 1) { + || indexPoint == tripMapPoints.size() - 1) && defaultLineCoordinates.size() > 1) { - LineString lineString = geometryFactory.createLineString(defaultLineCoordinates.toArray( new Coordinate[0])); + LineString lineString = geometryFactory.createLineString(defaultLineCoordinates.toArray(new Coordinate[0])); lineBuilder.add(lineString); lineBuilder.add("trip"); SimpleFeature feature = lineBuilder.buildFeature(null); @@ -330,7 +330,6 @@ public class TripMapContentBuilder { } - } Style styleLines = findStyle(styledLayerDescriptor, TRIP_LONGLINE_LINE_LAYER_NAME, null); @@ -396,7 +395,7 @@ public class TripMapContentBuilder { pointsFeatures.add(pointBuilder.buildFeature(null)); // add point in legend - if (TRIP_MAP_POINT_TYPES_IN_LEGEND.contains(type) && ! pointTypeInLegend.contains(type)) { + if (TRIP_MAP_POINT_TYPES_IN_LEGEND.contains(type) && !pointTypeInLegend.contains(type)) { point = geometryFactory.createPoint(ObserveMapPaneLegendItem.pointCoordinates()); pointBuilder.add(point); pointBuilder.add(""); @@ -405,14 +404,14 @@ public class TripMapContentBuilder { ObserveMapPaneLegendItem legendPoint = new ObserveMapPaneLegendItem( pointBuilder.buildFeature(null), stylePoints, - I18nEnumUtil.getLabel(type)); + I18nEnumHelper.getLabel(type)); legendItems.add(legendPoint); pointTypeInLegend.add(type); } } - if (! pointsFeatures.isEmpty()) { + if (!pointsFeatures.isEmpty()) { Layer pointsLayer = new FeatureLayer(pointsFeatures, stylePoints, TRIP_POINTS_LAYER_NAME); mapContent.addLayer(pointsLayer); } @@ -422,7 +421,7 @@ public class TripMapContentBuilder { protected Style findStyle(StyledLayerDescriptor styledLayerDescriptor, final String layerName, String styleName, Style defaultStyle) { - Optional<StyledLayer> styledLayerOptional = styledLayerDescriptor.layers().stream().filter( input -> input.getName().equals(layerName)).findFirst(); + Optional<StyledLayer> styledLayerOptional = styledLayerDescriptor.layers().stream().filter(input -> input.getName().equals(layerName)).findFirst(); Style style = defaultStyle; diff --git a/observe-application-swing/src/main/resources/i18n/observe-application-swing_en_GB.properties b/observe-application-swing/src/main/resources/i18n/observe-application-swing_en_GB.properties index 64696e0..c357893 100644 --- a/observe-application-swing/src/main/resources/i18n/observe-application-swing_en_GB.properties +++ b/observe-application-swing/src/main/resources/i18n/observe-application-swing_en_GB.properties @@ -1804,6 +1804,40 @@ observe.converter.error.float.format= observe.converter.error.no.convertor= observe.converter.error.noValue= observe.entity.message.updating= +observe.enum..autreVessel= +observe.enum..ceVessel= +observe.enum..disabled= +observe.enum..enabled= +observe.enum..fromData= +observe.enum..fromReferentiel= +observe.enum..fromSample= +observe.enum..libre= +observe.enum..longline= +observe.enum..longlineActivity= +observe.enum..longlineActivityInHarbour= +observe.enum..longlineActivityWithHaulingEnd= +observe.enum..longlineActivityWithHaulingStart= +observe.enum..longlineActivityWithInteraction= +observe.enum..longlineActivityWithSettingEnd= +observe.enum..longlineActivityWithSettingStart= +observe.enum..longlineActivityWithStation= +observe.enum..longlineDepartureHarbour= +observe.enum..longlineLandingHarbour= +observe.enum..objet= +observe.enum..pasDeBalise= +observe.enum..pose= +observe.enum..recuperation= +observe.enum..recuperationEtRemplacement= +observe.enum..seine= +observe.enum..seineActivity= +observe.enum..seineActivityInHarbour= +observe.enum..seineActivityWithFreeSchoolType= +observe.enum..seineActivityWithObjectSchoolType= +observe.enum..seineDepartureHarbour= +observe.enum..seineLandingHarbour= +observe.enum..undefined= +observe.enum..unknown= +observe.enum..visite= observe.enum.gearType.longline=Longline gear type observe.enum.gearType.seine=Senne gear type observe.enum.nonTargetCatchComputedValueSource.fromData=Computed from data diff --git a/observe-application-swing/src/main/resources/i18n/observe-application-swing_es_ES.properties b/observe-application-swing/src/main/resources/i18n/observe-application-swing_es_ES.properties index 1c2656e..cd12f69 100644 --- a/observe-application-swing/src/main/resources/i18n/observe-application-swing_es_ES.properties +++ b/observe-application-swing/src/main/resources/i18n/observe-application-swing_es_ES.properties @@ -1804,6 +1804,40 @@ observe.converter.error.float.format= observe.converter.error.no.convertor= observe.converter.error.noValue= observe.entity.message.updating=Se está modificando el objeto actual '%1$s'. +observe.enum..autreVessel= +observe.enum..ceVessel= +observe.enum..disabled= +observe.enum..enabled= +observe.enum..fromData= +observe.enum..fromReferentiel= +observe.enum..fromSample= +observe.enum..libre= +observe.enum..longline= +observe.enum..longlineActivity= +observe.enum..longlineActivityInHarbour= +observe.enum..longlineActivityWithHaulingEnd= +observe.enum..longlineActivityWithHaulingStart= +observe.enum..longlineActivityWithInteraction= +observe.enum..longlineActivityWithSettingEnd= +observe.enum..longlineActivityWithSettingStart= +observe.enum..longlineActivityWithStation= +observe.enum..longlineDepartureHarbour= +observe.enum..longlineLandingHarbour= +observe.enum..objet= +observe.enum..pasDeBalise= +observe.enum..pose= +observe.enum..recuperation= +observe.enum..recuperationEtRemplacement= +observe.enum..seine= +observe.enum..seineActivity= +observe.enum..seineActivityInHarbour= +observe.enum..seineActivityWithFreeSchoolType= +observe.enum..seineActivityWithObjectSchoolType= +observe.enum..seineDepartureHarbour= +observe.enum..seineLandingHarbour= +observe.enum..undefined= +observe.enum..unknown= +observe.enum..visite= observe.enum.gearType.longline=Palangre observe.enum.gearType.seine=Senne observe.enum.nonTargetCatchComputedValueSource.fromData=Calculado a partir de otros datos diff --git a/observe-application-swing/src/main/resources/i18n/observe-application-swing_fr_FR.properties b/observe-application-swing/src/main/resources/i18n/observe-application-swing_fr_FR.properties index 47cd21f..034c73f 100644 --- a/observe-application-swing/src/main/resources/i18n/observe-application-swing_fr_FR.properties +++ b/observe-application-swing/src/main/resources/i18n/observe-application-swing_fr_FR.properties @@ -1804,40 +1804,40 @@ observe.converter.error.float.format=Format de décimal incorrecte pour la valeu observe.converter.error.no.convertor=Impossible de convertir le décimal %s depuis le convertisseur %s observe.converter.error.noValue=Aucune valeur à convertir pour le convertisseur %s observe.entity.message.updating=L'objet '%1$s' est en cours de modification. -observe.enum.gearType.longline=longline -observe.enum.gearType.seine=Seine -observe.enum.nonTargetCatchComputedValueSource.fromData=calculé à partir des autres données -observe.enum.nonTargetCatchComputedValueSource.fromReferentiel=calculé à partir du référentiel -observe.enum.nonTargetCatchComputedValueSource.fromSample=calculé à partir des échantillons -observe.enum.ownership.autreVessel=Navire d'un autre armement -observe.enum.ownership.ceVessel=Ce navire ou cet armement -observe.enum.ownership.unknown=Inconnue -observe.enum.referenceStatus.disabled=Désactivé -observe.enum.referenceStatus.enabled=Actif -observe.enum.schoolType.libre=Banc libre -observe.enum.schoolType.objet=Banc objet -observe.enum.schoolType.undefined=Banc indéterminé -observe.enum.tripMapPointType.longlineActivity=point d'activité -observe.enum.tripMapPointType.longlineActivityInHarbour=Au port -observe.enum.tripMapPointType.longlineActivityWithHaulingEnd=Fin de virage -observe.enum.tripMapPointType.longlineActivityWithHaulingStart=Début de virage -observe.enum.tripMapPointType.longlineActivityWithInteraction=Rencontre -observe.enum.tripMapPointType.longlineActivityWithSettingEnd=Fin de filage -observe.enum.tripMapPointType.longlineActivityWithSettingStart=Début de filage -observe.enum.tripMapPointType.longlineActivityWithStation=Station océanographique -observe.enum.tripMapPointType.longlineDepartureHarbour=Port de départ -observe.enum.tripMapPointType.longlineLandingHarbour=Port d'arrivée -observe.enum.tripMapPointType.seineActivity=point d'activité -observe.enum.tripMapPointType.seineActivityInHarbour=Au port -observe.enum.tripMapPointType.seineActivityWithFreeSchoolType=Banc libre -observe.enum.tripMapPointType.seineActivityWithObjectSchoolType=Banc objet -observe.enum.tripMapPointType.seineDepartureHarbour=Port de départ -observe.enum.tripMapPointType.seineLandingHarbour=Port d'arrivée -observe.enum.typeTransmittingBuoyOperation.pasDeBalise=Pas de balise liée au DCP -observe.enum.typeTransmittingBuoyOperation.pose=Pose d'une nouvelle balise -observe.enum.typeTransmittingBuoyOperation.recuperation=Récupération d'une balise sans remise à l'eau -observe.enum.typeTransmittingBuoyOperation.recuperationEtRemplacement=Récupération et pose d'une nouvelle balise -observe.enum.typeTransmittingBuoyOperation.visite=Simple visite de la balise +observe.enum.fr.ird.observe.services.dto.constants.GearType.longline=Longline +observe.enum.fr.ird.observe.services.dto.constants.GearType.seine=Senne +observe.enum.fr.ird.observe.services.dto.constants.ReferenceStatus.disabled=Désactivé +observe.enum.fr.ird.observe.services.dto.constants.ReferenceStatus.enabled=Actif +observe.enum.fr.ird.observe.services.dto.constants.TripMapPointType.longlineActivity=point d'activité +observe.enum.fr.ird.observe.services.dto.constants.TripMapPointType.longlineActivityInHarbour=Au port +observe.enum.fr.ird.observe.services.dto.constants.TripMapPointType.longlineActivityWithHaulingEnd=Fin de virage +observe.enum.fr.ird.observe.services.dto.constants.TripMapPointType.longlineActivityWithHaulingStart=Début de virage +observe.enum.fr.ird.observe.services.dto.constants.TripMapPointType.longlineActivityWithInteraction=Rencontre +observe.enum.fr.ird.observe.services.dto.constants.TripMapPointType.longlineActivityWithSettingEnd=Fin de filage +observe.enum.fr.ird.observe.services.dto.constants.TripMapPointType.longlineActivityWithSettingStart=Début de filage +observe.enum.fr.ird.observe.services.dto.constants.TripMapPointType.longlineActivityWithStation=Station océanographique +observe.enum.fr.ird.observe.services.dto.constants.TripMapPointType.longlineDepartureHarbour=Port de départ +observe.enum.fr.ird.observe.services.dto.constants.TripMapPointType.longlineLandingHarbour=Port d'arrivée +observe.enum.fr.ird.observe.services.dto.constants.TripMapPointType.seineActivity=point d'activité +observe.enum.fr.ird.observe.services.dto.constants.TripMapPointType.seineActivityInHarbour=Au port +observe.enum.fr.ird.observe.services.dto.constants.TripMapPointType.seineActivityWithFreeSchoolType=Banc libre +observe.enum.fr.ird.observe.services.dto.constants.TripMapPointType.seineActivityWithObjectSchoolType=Banc objet +observe.enum.fr.ird.observe.services.dto.constants.TripMapPointType.seineDepartureHarbour=Port de départ +observe.enum.fr.ird.observe.services.dto.constants.TripMapPointType.seineLandingHarbour=Port d'arrivée +observe.enum.fr.ird.observe.services.dto.constants.seine.NonTargetCatchComputedValueSource.fromData=calculé à partir des autres données +observe.enum.fr.ird.observe.services.dto.constants.seine.NonTargetCatchComputedValueSource.fromReferentiel=calculé à partir du référentiel +observe.enum.fr.ird.observe.services.dto.constants.seine.NonTargetCatchComputedValueSource.fromSample=calculé à partir des échantillons +observe.enum.fr.ird.observe.services.dto.constants.seine.Ownership.autreVessel=Navire d'un autre armement +observe.enum.fr.ird.observe.services.dto.constants.seine.Ownership.ceVessel=Ce navire ou cet armement +observe.enum.fr.ird.observe.services.dto.constants.seine.Ownership.unknown=Inconnue +observe.enum.fr.ird.observe.services.dto.constants.seine.SchoolType.libre=Banc libre +observe.enum.fr.ird.observe.services.dto.constants.seine.SchoolType.objet=Banc objet +observe.enum.fr.ird.observe.services.dto.constants.seine.SchoolType.undefined=Banc indéterminé +observe.enum.fr.ird.observe.services.dto.constants.seine.TypeTransmittingBuoyOperation.pasDeBalise=Pas de balise liée au DCP +observe.enum.fr.ird.observe.services.dto.constants.seine.TypeTransmittingBuoyOperation.pose=Pose d'une nouvelle balise +observe.enum.fr.ird.observe.services.dto.constants.seine.TypeTransmittingBuoyOperation.recuperation=Récupération d'une balise sans remise à l'eau +observe.enum.fr.ird.observe.services.dto.constants.seine.TypeTransmittingBuoyOperation.recuperationEtRemplacement=Récupération et pose d'une nouvelle balise +observe.enum.fr.ird.observe.services.dto.constants.seine.TypeTransmittingBuoyOperation.visite=Simple visite de la balise observe.error.can.not.create.directory=Création du répertoire %1$s impossible\! observe.error.no.activity.6=L'activité de type 6 n'a pas été trouvée en base. observe.error.storage.could.not.backup.unsane.local.db=Impossible d'enregistrer une base non endommagée diff --git a/pom.xml b/pom.xml index 5feaacc..41cec1b 100644 --- a/pom.xml +++ b/pom.xml @@ -128,7 +128,7 @@ <topiaVersion>3.1.3</topiaVersion> <jaxxVersion>2.31</jaxxVersion> - <nuitonI18nVersion>3.5.2</nuitonI18nVersion> + <nuitonI18nVersion>3.5.3-SNAPSHOT</nuitonI18nVersion> <nuitonValidatorVersion>3.0.1</nuitonValidatorVersion> <xworkVersion>2.3.29</xworkVersion> @@ -148,8 +148,8 @@ <!-- i18n configuration --> <!--FIXME Traduire en es et en --> - <i18n.bundles>fr_FR,en_GB,es_ES</i18n.bundles> - <!--<i18n.bundles>fr_FR</i18n.bundles>--> + <!--<i18n.bundles>fr_FR,en_GB,es_ES</i18n.bundles>--> + <i18n.bundles>fr_FR</i18n.bundles> <i18n.silent>true</i18n.silent> <i18n.failsIfWarning>false</i18n.failsIfWarning> <i18n.checkBundle>true</i18n.checkBundle> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.