This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See http://git.codelutin.com/tutti.git commit 71ec21caaa85ff7bb7fce952034c5e0fe132b82e Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Mar 8 14:23:54 2016 +0100 Ajout des traductions d'enumération dans l'api de service --- observe-services-api/pom.xml | 12 ++++ .../fr/ird/observe/services/util/I18nEnumUtil.java | 75 ++++++++++++++++++++++ .../i18n/observe-services-api_en_GB.properties | 34 ++++++++++ .../i18n/observe-services-api_es_ES.properties | 34 ++++++++++ .../i18n/observe-services-api_fr_FR.properties | 34 ++++++++++ 5 files changed, 189 insertions(+) diff --git a/observe-services-api/pom.xml b/observe-services-api/pom.xml index caa513d..b3da66d 100644 --- a/observe-services-api/pom.xml +++ b/observe-services-api/pom.xml @@ -107,6 +107,18 @@ </testResources> <plugins> <plugin> + <groupId>org.nuiton.i18n</groupId> + <artifactId>i18n-maven-plugin</artifactId> + <executions> + <execution> + <goals> + <goal>parserJava</goal> + <goal>gen</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> <groupId>com.thoughtworks.paranamer</groupId> <artifactId>paranamer-maven-plugin</artifactId> <executions> diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/util/I18nEnumUtil.java b/observe-services-api/src/main/java/fr/ird/observe/services/util/I18nEnumUtil.java new file mode 100644 index 0000000..7d63604 --- /dev/null +++ b/observe-services-api/src/main/java/fr/ird/observe/services/util/I18nEnumUtil.java @@ -0,0 +1,75 @@ +package fr.ird.observe.services.util; + +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.schoolType.undefined"); + n("observe.schoolType.objet"); + n("observe.schoolType.libre"); + + n("observe.typeTransmittingBuoyOperation.pasDeBalise"); + n("observe.typeTransmittingBuoyOperation.visite"); + n("observe.typeTransmittingBuoyOperation.recuperation"); + n("observe.typeTransmittingBuoyOperation.pose"); + n("observe.typeTransmittingBuoyOperation.recuperationEtRemplacement"); + + n("observe.ownership.unknown"); + n("observe.ownership.ceVessel"); + n("observe.ownership.autreVessel"); + + n("observe.nonTargetCatchComputedValueSource.fromData"); + n("observe.nonTargetCatchComputedValueSource.fromSample"); + n("observe.nonTargetCatchComputedValueSource.fromReferentiel"); + + n("observe.gearType.longline"); + n("observe.gearType.seine"); + + n("observe.tripMapPointType.seineDepartureHarbour"); + n("observe.tripMapPointType.seineLandingHarbour"); + n("observe.tripMapPointType.seineActivity"); + n("observe.tripMapPointType.seineActivityInHarbour"); + n("observe.tripMapPointType.seineActivityWithFreeSchoolType"); + n("observe.tripMapPointType.seineActivityWithObjectSchoolType"); + n("observe.tripMapPointType.longlineActivity"); + n("observe.tripMapPointType.longlineDepartureHarbour"); + n("observe.tripMapPointType.longlineLandingHarbour"); + n("observe.tripMapPointType.longlineActivityInHarbour"); + n("observe.tripMapPointType.longlineActivityWithSettingStart"); + n("observe.tripMapPointType.longlineActivityWithSettingEnd"); + n("observe.tripMapPointType.longlineActivityWithHaulingStart"); + n("observe.tripMapPointType.longlineActivityWithHaulingEnd"); + n("observe.tripMapPointType.longlineActivityWithInteraction"); + n("observe.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 = Introspector.decapitalize(e.getClass().getSimpleName()); + simpleName = simpleName.replace("Persist", ""); + + return "observe." + simpleName + "." + e.name(); + } + +} diff --git a/observe-services-api/src/main/resources/i18n/observe-services-api_en_GB.properties b/observe-services-api/src/main/resources/i18n/observe-services-api_en_GB.properties new file mode 100644 index 0000000..6814e64 --- /dev/null +++ b/observe-services-api/src/main/resources/i18n/observe-services-api_en_GB.properties @@ -0,0 +1,34 @@ +observe.gearType.longline=Longline gear type +observe.gearType.seine=Senne gear type +observe.nonTargetCatchComputedValueSource.fromData=Computed from data +observe.nonTargetCatchComputedValueSource.fromReferentiel=Computed from referential +observe.nonTargetCatchComputedValueSource.fromSample=Computed from samples +observe.ownership.autreVessel=Other vessel +observe.ownership.ceVessel=This vessel +observe.ownership.unknown=Unknown +observe.referenceStatus.disabled=Disabled +observe.referenceStatus.enabled=Enabled +observe.schoolType.libre=Free school type +observe.schoolType.objet=Object school type +observe.schoolType.undefined=Undefined school type +observe.tripMapPointType.longlineActivity=Activity +observe.tripMapPointType.longlineActivityInHarbour=Au Harbour +observe.tripMapPointType.longlineActivityWithHaulingEnd=Hauling end +observe.tripMapPointType.longlineActivityWithHaulingStart=Hauling start +observe.tripMapPointType.longlineActivityWithInteraction=Encounter +observe.tripMapPointType.longlineActivityWithSettingEnd=Setting end +observe.tripMapPointType.longlineActivityWithSettingStart=Setting start +observe.tripMapPointType.longlineActivityWithStation=Station +observe.tripMapPointType.longlineDepartureHarbour=Harbour departure +observe.tripMapPointType.longlineLandingHarbour=Harbour landing +observe.tripMapPointType.seineActivity=Activity +observe.tripMapPointType.seineActivityInHarbour=In harbour +observe.tripMapPointType.seineActivityWithFreeSchoolType=Free School type +observe.tripMapPointType.seineActivityWithObjectSchoolType=Object School type +observe.tripMapPointType.seineDepartureHarbour=Harbour departure +observe.tripMapPointType.seineLandingHarbour=Harbour landing +observe.typeTransmittingBuoyOperation.pasDeBalise=No Beacon +observe.typeTransmittingBuoyOperation.pose=Posing +observe.typeTransmittingBuoyOperation.recuperation=Grab +observe.typeTransmittingBuoyOperation.recuperationEtRemplacement=Grab and change +observe.typeTransmittingBuoyOperation.visite=Visit diff --git a/observe-services-api/src/main/resources/i18n/observe-services-api_es_ES.properties b/observe-services-api/src/main/resources/i18n/observe-services-api_es_ES.properties new file mode 100644 index 0000000..da0ff94 --- /dev/null +++ b/observe-services-api/src/main/resources/i18n/observe-services-api_es_ES.properties @@ -0,0 +1,34 @@ +observe.gearType.longline=Palangre +observe.gearType.seine=Senne +observe.nonTargetCatchComputedValueSource.fromData=Calculado a partir de otros datos +observe.nonTargetCatchComputedValueSource.fromReferentiel=Calculado a partir del Referencial +observe.nonTargetCatchComputedValueSource.fromSample=Calculado a partir de las muestras +observe.ownership.autreVessel=Barco ajeno +observe.ownership.ceVessel=Este barco o un barco del mismo armador +observe.ownership.unknown=Desconocido +observe.referenceStatus.disabled=Desactivado +observe.referenceStatus.enabled=ActivadoreferenceStatus +observe.schoolType.libre=Banco libre +observe.schoolType.objet=Banco a objeto +observe.schoolType.undefined=Banco indeterminado +observe.tripMapPointType.longlineActivity=Activity +observe.tripMapPointType.longlineActivityInHarbour=Au Harbour +observe.tripMapPointType.longlineActivityWithHaulingEnd=Hauling end +observe.tripMapPointType.longlineActivityWithHaulingStart=Hauling start +observe.tripMapPointType.longlineActivityWithInteraction=Encounter +observe.tripMapPointType.longlineActivityWithSettingEnd=Setting end +observe.tripMapPointType.longlineActivityWithSettingStart=Setting start +observe.tripMapPointType.longlineActivityWithStation=Station +observe.tripMapPointType.longlineDepartureHarbour=Harbour departure +observe.tripMapPointType.longlineLandingHarbour=Harbour landing +observe.tripMapPointType.seineActivity=Activity +observe.tripMapPointType.seineActivityInHarbour=In harbour +observe.tripMapPointType.seineActivityWithFreeSchoolType=Banco libre +observe.tripMapPointType.seineActivityWithObjectSchoolType=Banco a objeto +observe.tripMapPointType.seineDepartureHarbour=Harbour departure +observe.tripMapPointType.seineLandingHarbour=Harbour landing +observe.typeTransmittingBuoyOperation.pasDeBalise=DCP sin balizar +observe.typeTransmittingBuoyOperation.pose=Colocación de nueva baliza +observe.typeTransmittingBuoyOperation.recuperation=Recogida de baliza sin regreso al agua +observe.typeTransmittingBuoyOperation.recuperationEtRemplacement=Recuperación y colocación de una nueva baliza +observe.typeTransmittingBuoyOperation.visite=Visita a la baliza diff --git a/observe-services-api/src/main/resources/i18n/observe-services-api_fr_FR.properties b/observe-services-api/src/main/resources/i18n/observe-services-api_fr_FR.properties new file mode 100644 index 0000000..23f57dc --- /dev/null +++ b/observe-services-api/src/main/resources/i18n/observe-services-api_fr_FR.properties @@ -0,0 +1,34 @@ +observe.gearType.longline=longline +observe.gearType.seine=Seine +observe.nonTargetCatchComputedValueSource.fromData=calculé à partir des autres données +observe.nonTargetCatchComputedValueSource.fromReferentiel=calculé à partir du référentiel +observe.nonTargetCatchComputedValueSource.fromSample=calculé à partir des échantillons +observe.ownership.autreVessel=Navire d'un autre armement +observe.ownership.ceVessel=Ce navire ou cet armement +observe.ownership.unknown=Inconnue +observe.referenceStatus.disabled=Désactivé +observe.referenceStatus.enabled=Activé +observe.schoolType.libre=Banc libre +observe.schoolType.objet=Banc objet +observe.schoolType.undefined=Banc indéterminé +observe.tripMapPointType.longlineActivity=point d'activité +observe.tripMapPointType.longlineActivityInHarbour=Au port +observe.tripMapPointType.longlineActivityWithHaulingEnd=Fin de virage +observe.tripMapPointType.longlineActivityWithHaulingStart=Début de virage +observe.tripMapPointType.longlineActivityWithInteraction=Rencontre +observe.tripMapPointType.longlineActivityWithSettingEnd=Fin de filage +observe.tripMapPointType.longlineActivityWithSettingStart=Début de filage +observe.tripMapPointType.longlineActivityWithStation=Station océanographique +observe.tripMapPointType.longlineDepartureHarbour=Port de départ +observe.tripMapPointType.longlineLandingHarbour=Port d'arrivée +observe.tripMapPointType.seineActivity=point d'activité +observe.tripMapPointType.seineActivityInHarbour=Au port +observe.tripMapPointType.seineActivityWithFreeSchoolType=Banc libre +observe.tripMapPointType.seineActivityWithObjectSchoolType=Banc objet +observe.tripMapPointType.seineDepartureHarbour=Port de départ +observe.tripMapPointType.seineLandingHarbour=Port d'arrivée +observe.typeTransmittingBuoyOperation.pasDeBalise=Pas de balise liée au DCP +observe.typeTransmittingBuoyOperation.pose=Pose d'une nouvelle balise +observe.typeTransmittingBuoyOperation.recuperation=Récupération d'une balise sans remise à l'eau +observe.typeTransmittingBuoyOperation.recuperationEtRemplacement=Récupération et pose d'une nouvelle balise +observe.typeTransmittingBuoyOperation.visite=Simple visite de la balise -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.