This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See http://git.codelutin.com/observe.git commit b2a8a87b3e324598a2f3eef54c60ea884e930715 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Oct 18 17:54:19 2015 +0200 Amélioration des clefs de traductions sur le module entités + remplissage de traudction manquantes --- .../observe/entities/tripMap/TripMapPointType.java | 4 +- .../ird/observe/entities/constants/GearType.java | 4 +- .../seine/NonTargetCatchComputedValueSource.java | 6 +- .../entities/constants/seine/Ownership.java | 6 +- .../entities/constants/seine/SchoolType.java | 6 +- .../seine/TypeTransmittingBuoyOperation.java | 10 +-- .../ird/observe/entities/referentiel/Species2.java | 2 +- .../i18n/observe-entities_en_GB.properties | 74 +++++++++++----------- .../i18n/observe-entities_es_ES.properties | 42 ++++++------ .../i18n/observe-entities_fr_FR.properties | 42 ++++++------ .../services/dto/constants/ReferenceStatus.java | 4 +- .../services/dto/constants/TripMapPointType.java | 4 +- 12 files changed, 102 insertions(+), 102 deletions(-) diff --git a/observe-application-swing/src/main/java/fr/ird/observe/entities/tripMap/TripMapPointType.java b/observe-application-swing/src/main/java/fr/ird/observe/entities/tripMap/TripMapPointType.java index 917ac54..4dac356 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/entities/tripMap/TripMapPointType.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/entities/tripMap/TripMapPointType.java @@ -34,8 +34,8 @@ public enum TripMapPointType { SEINE_LANDING_HARBOUR(n("observe.map.seine.harbour.landing")), SEINE_ACTIVITY(n("observe.map.seine.activity")), SEINE_ACTIVITY_IN_HARBOUR(n("observe.map.seine.activity.inHarbour")), - SEINE_ACTIVITY_WITH_FREE_SCHOOL_TYPE(n("observe.map.seine.activity.schollType.free")), - SEINE_ACTIVITY_WITH_OBJECT_SCHOOL_TYPE(n("observe.map.seine.activity.schollType.object")), + SEINE_ACTIVITY_WITH_FREE_SCHOOL_TYPE(n("observe.map.seine.activity.schoolType.free")), + SEINE_ACTIVITY_WITH_OBJECT_SCHOOL_TYPE(n("observe.map.seine.activity.schoolType.object")), LONGLINE_IN_HARBOUR(n("observe.map.longLine.seine.harbour")), LONGLINE_ACTIVITY(n("observe.map.longLine.activity")), diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/constants/GearType.java b/observe-entities/src/main/java/fr/ird/observe/entities/constants/GearType.java index 26f07f9..01a2a49 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/constants/GearType.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/constants/GearType.java @@ -34,10 +34,10 @@ import static org.nuiton.i18n.I18n.t; public enum GearType { /** Seine */ - seine(n("observe.common.reference.gearType.seine")), + seine(n("observe.reference.gearType.seine")), /** Longline */ - longline(n("observe.common.reference.gearType.longline")); + longline(n("observe.reference.gearType.longline")); private String i18nKey; diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/constants/seine/NonTargetCatchComputedValueSource.java b/observe-entities/src/main/java/fr/ird/observe/entities/constants/seine/NonTargetCatchComputedValueSource.java index 948f66c..e3c1523 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/constants/seine/NonTargetCatchComputedValueSource.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/constants/seine/NonTargetCatchComputedValueSource.java @@ -38,19 +38,19 @@ public enum NonTargetCatchComputedValueSource { * * @since 3.0 */ - FROM_DATA(n("observe.persistence.computedValueSource.fromData")), + FROM_DATA(n("observe.computedValueSource.fromData")), /** * Donnée calculée à partir de l'échantillon pour la même espèce et la même calée. * * @since 3.0 */ - FROM_SAMPLE(n("observe.common.computedValueSource.fromSample")), + FROM_SAMPLE(n("observe.computedValueSource.fromSample")), /** * Donnée calculée à partir du référentiel. * * @since 3.0 */ - FROM_REFERENTIEL(n("observe.persistence.computedValueSource.fromReferentiel")); + FROM_REFERENTIEL(n("observe.computedValueSource.fromReferentiel")); private final String i18nKey; diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/constants/seine/Ownership.java b/observe-entities/src/main/java/fr/ird/observe/entities/constants/seine/Ownership.java index fbfd2a7..c0572a7 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/constants/seine/Ownership.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/constants/seine/Ownership.java @@ -32,13 +32,13 @@ import static org.nuiton.i18n.I18n.t; public enum Ownership implements Comparable<Ownership> { /** inconnue */ - unknown(n("observe.common.ownership.unknown")), + unknown(n("observe.ownership.unknown")), /** appartient a ce vessel */ - ceVessel(n("observe.common.ownership.ceVessel")), + ceVessel(n("observe.ownership.ceVessel")), /** appartien a un autre vessel */ - autreVessel(n("observe.common.ownership.autreVessel")); + autreVessel(n("observe.ownership.autreVessel")); private String i18nKey; diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/constants/seine/SchoolType.java b/observe-entities/src/main/java/fr/ird/observe/entities/constants/seine/SchoolType.java index 0c74c0b..7da4d02 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/constants/seine/SchoolType.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/constants/seine/SchoolType.java @@ -33,13 +33,13 @@ import static org.nuiton.i18n.I18n.t; public enum SchoolType { /** banc indéterminé (valeur par défaut) // was 3 before version 4.0 */ - undefined(n("observe.persistence.schoolType.undefined")), + undefined(n("observe.schoolType.undefined")), /** banc objet // was 1 before version 4.0 */ - objet(n("observe.persistence.schoolType.objet")), + objet(n("observe.schoolType.objet")), /** banc libre // was 2 before version 4.0 */ - libre(n("observe.persistence.schoolType.libre")); + libre(n("observe.schoolType.libre")); private String i18nKey; diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/constants/seine/TypeTransmittingBuoyOperation.java b/observe-entities/src/main/java/fr/ird/observe/entities/constants/seine/TypeTransmittingBuoyOperation.java index 75516b8..80c4a9b 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/constants/seine/TypeTransmittingBuoyOperation.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/constants/seine/TypeTransmittingBuoyOperation.java @@ -27,15 +27,15 @@ import static org.nuiton.i18n.I18n.t; /** @author Tony Chemit - chemit@codelutin.com */ public enum TypeTransmittingBuoyOperation { // pas de balise lue - pasDeBalise(n("observe.persistence.balise.objectOperation.no.balise")), + pasDeBalise(n("observe.typeTransmittingBuoyOperation.no.balise")), // une balise lue - visite(n("observe.persistence.balise.objectOperation.visite"), "1"), - recuperation(n("observe.persistence.balise.objectOperation.recupere"), "2"), - pose(n("observe.persistence.balise.objectOperation.pose"), "3"), + visite(n("observe.typeTransmittingBuoyOperation.visite"), "1"), + recuperation(n("observe.typeTransmittingBuoyOperation.recupere"), "2"), + pose(n("observe.typeTransmittingBuoyOperation.pose"), "3"), // deux balises lues - recuperationEtRemplacement(n("observe.persistence.balise.objectOperation.recupere.et.change"), "2", "3"); + recuperationEtRemplacement(n("observe.typeTransmittingBuoyOperation.recupere.et.change"), "2", "3"); /** clef i18n du type d'opération sur balise */ private String i18nKey; diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/referentiel/Species2.java b/observe-entities/src/main/java/fr/ird/observe/entities/referentiel/Species2.java index 971a471..52c9420 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/referentiel/Species2.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/referentiel/Species2.java @@ -91,7 +91,7 @@ public class Species2 { public static String decorate(Locale locale, Species species) { - String oldCode = l(locale, "observe.persistence.oldCode3L"); + String oldCode = l(locale, "observe.common.oldCode3L"); StringBuilder builder = new StringBuilder(); builder.append(species.getFaoCode()); if (species.getScientificLabel() == null) { diff --git a/observe-entities/src/main/resources/i18n/observe-entities_en_GB.properties b/observe-entities/src/main/resources/i18n/observe-entities_en_GB.properties index 42275ef..3250a63 100644 --- a/observe-entities/src/main/resources/i18n/observe-entities_en_GB.properties +++ b/observe-entities/src/main/resources/i18n/observe-entities_en_GB.properties @@ -1,37 +1,37 @@ -observe.common.computedValueSource.fromSample= -observe.common.endDate= -observe.common.endPursingDate= -observe.common.gpsPointInterval= -observe.common.ownership.autreVessel= -observe.common.ownership.ceVessel= -observe.common.ownership.unknown= -observe.common.quadrant= -observe.common.reference.gearType.longline= -observe.common.reference.gearType.seine= -observe.common.reference.status.disabled= -observe.common.reference.status.enabled= -observe.map.longLine.activity= -observe.map.longLine.activity.hauling.end= -observe.map.longLine.activity.hauling.start= -observe.map.longLine.activity.interaction= -observe.map.longLine.activity.setting.end= -observe.map.longLine.activity.setting.start= -observe.map.longLine.activity.station= -observe.map.longLine.seine.harbour= -observe.map.seine.activity= -observe.map.seine.activity.inHarbour= -observe.map.seine.activity.schollType.free= -observe.map.seine.activity.schollType.object= -observe.map.seine.harbour.departure= -observe.map.seine.harbour.landing= -observe.persistence.balise.objectOperation.no.balise= -observe.persistence.balise.objectOperation.pose= -observe.persistence.balise.objectOperation.recupere= -observe.persistence.balise.objectOperation.recupere.et.change= -observe.persistence.balise.objectOperation.visite= -observe.persistence.computedValueSource.fromData=Computed from data -observe.persistence.computedValueSource.fromReferentiel=Computed from referential -observe.persistence.oldCode3L=Old code\: -observe.persistence.schoolType.libre=Free school type -observe.persistence.schoolType.objet=Object school type -observe.persistence.schoolType.undefined=Undefined school type +observe.typeTransmittingBuoyOperation.no.balise=No Beacon +observe.typeTransmittingBuoyOperation.pose=Posing +observe.typeTransmittingBuoyOperation.recupere=Grab +observe.typeTransmittingBuoyOperation.recupere.et.change=Grab and change +observe.typeTransmittingBuoyOperation.visite=Visit +observe.common.endDate=End date +observe.common.endPursingDate=End pursing date +observe.common.gpsPointInterval=Interval %1$td/%1$tm/%1$tY %1$tH\:%1$tM\:%1$tS - %2$td/%2$tm/%2$tY %2$tH\:%2$tM\:%2$tM ( number if point(s) \: %3$s ) +observe.common.oldCode3L=Old code\: +observe.common.quadrant=Quadrant +observe.computedValueSource.fromData=Computed from data +observe.computedValueSource.fromReferentiel=Computed from referential +observe.computedValueSource.fromSample=Computed from samples +observe.map.longLine.activity=Activity +observe.map.longLine.activity.hauling.end=Hauling end +observe.map.longLine.activity.hauling.start=Hauling start +observe.map.longLine.activity.interaction=Encounter +observe.map.longLine.activity.setting.end=Setting end +observe.map.longLine.activity.setting.start=Setting start +observe.map.longLine.activity.station=Station +observe.map.longLine.seine.harbour=Harbour +observe.map.seine.activity=Activity +observe.map.seine.activity.inHarbour=In harbour +observe.map.seine.activity.schoolType.free=Free School type +observe.map.seine.activity.schoolType.object=Object School type +observe.map.seine.harbour.departure=Harbour departure +observe.map.seine.harbour.landing=Harbour landing +observe.ownership.autreVessel=Other vessel +observe.ownership.ceVessel=This vessel +observe.ownership.unknown=Unknown +observe.reference.gearType.longline=Longline gear type +observe.reference.gearType.seine=Senne gear type +observe.reference.status.disabled=Disabled +observe.reference.status.enabled=Enabled +observe.schoolType.libre=Free school type +observe.schoolType.objet=Object school type +observe.schoolType.undefined=Undefined school type diff --git a/observe-entities/src/main/resources/i18n/observe-entities_es_ES.properties b/observe-entities/src/main/resources/i18n/observe-entities_es_ES.properties index c12ab41..c9219a9 100644 --- a/observe-entities/src/main/resources/i18n/observe-entities_es_ES.properties +++ b/observe-entities/src/main/resources/i18n/observe-entities_es_ES.properties @@ -1,15 +1,16 @@ -observe.common.computedValueSource.fromSample= +observe.typeTransmittingBuoyOperation.no.balise=DCP sin balizar +observe.typeTransmittingBuoyOperation.pose=Colocación de nueva baliza +observe.typeTransmittingBuoyOperation.recupere=Recogida de baliza sin regreso al agua +observe.typeTransmittingBuoyOperation.recupere.et.change=Recuperación y colocación de una nueva baliza +observe.typeTransmittingBuoyOperation.visite=Visita a la baliza observe.common.endDate=Fecha de fin observe.common.endPursingDate=Fecha de final de recogida de la jareta observe.common.gpsPointInterval=Intervalo %1$td/%1$tm/%1$tY %1$tH\:%1$tM\:%1$tS - %2$td/%2$tm/%2$tY %2$tH\:%2$tM\:%2$tM ( número de punto(s) \: %3$s ) -observe.common.ownership.autreVessel=Barco ajeno -observe.common.ownership.ceVessel=Este barco o un barco del mismo armador -observe.common.ownership.unknown=Desconocido +observe.common.oldCode3L=Antiguo código\: observe.common.quadrant=Cuadrante -observe.common.reference.gearType.longline=Senne -observe.common.reference.gearType.seine= -observe.common.reference.status.disabled=Desactivado -observe.common.reference.status.enabled=Activado +observe.computedValueSource.fromData=Calculado a partir de otros datos +observe.computedValueSource.fromReferentiel=Calculado a partir del Referencial +observe.computedValueSource.fromSample=Calculado a partir de las muestras observe.map.longLine.activity= observe.map.longLine.activity.hauling.end= observe.map.longLine.activity.hauling.start= @@ -20,18 +21,17 @@ observe.map.longLine.activity.station= observe.map.longLine.seine.harbour= observe.map.seine.activity= observe.map.seine.activity.inHarbour= -observe.map.seine.activity.schollType.free= -observe.map.seine.activity.schollType.object= +observe.map.seine.activity.schoolType.free=Banco libre +observe.map.seine.activity.schoolType.object=Banco a objeto observe.map.seine.harbour.departure= observe.map.seine.harbour.landing= -observe.persistence.balise.objectOperation.no.balise=DCP sin balizar -observe.persistence.balise.objectOperation.pose=Colocación de nueva baliza -observe.persistence.balise.objectOperation.recupere=Recogida de baliza sin regreso al agua -observe.persistence.balise.objectOperation.recupere.et.change=Recuperación y colocación de una nueva baliza -observe.persistence.balise.objectOperation.visite=Visita a la baliza -observe.persistence.computedValueSource.fromData=Calculado a partir de otros datos -observe.persistence.computedValueSource.fromReferentiel=Calculado a partir del Referencial -observe.persistence.oldCode3L=Antiguo código\: -observe.persistence.schoolType.libre=Banco libre -observe.persistence.schoolType.objet=Banco a objeto -observe.persistence.schoolType.undefined=Banco indeterminado +observe.ownership.autreVessel=Barco ajeno +observe.ownership.ceVessel=Este barco o un barco del mismo armador +observe.ownership.unknown=Desconocido +observe.reference.gearType.longline=Palangre +observe.reference.gearType.seine=Senne +observe.reference.status.disabled=Desactivado +observe.reference.status.enabled=Activado +observe.schoolType.libre=Banco libre +observe.schoolType.objet=Banco a objeto +observe.schoolType.undefined=Banco indeterminado diff --git a/observe-entities/src/main/resources/i18n/observe-entities_fr_FR.properties b/observe-entities/src/main/resources/i18n/observe-entities_fr_FR.properties index 0fa154d..eb795c5 100644 --- a/observe-entities/src/main/resources/i18n/observe-entities_fr_FR.properties +++ b/observe-entities/src/main/resources/i18n/observe-entities_fr_FR.properties @@ -1,15 +1,16 @@ -observe.common.computedValueSource.fromSample= +observe.typeTransmittingBuoyOperation.no.balise=Pas de balise liée au DCP +observe.typeTransmittingBuoyOperation.pose=Pose d'une nouvelle balise +observe.typeTransmittingBuoyOperation.recupere=Récupération d'une balise sans remise à l'eau +observe.typeTransmittingBuoyOperation.recupere.et.change=Récupération et pose d'une nouvelle balise +observe.typeTransmittingBuoyOperation.visite=Simple visite de la balise observe.common.endDate=Fin de validité observe.common.endPursingDate=Date de fin de coulissage observe.common.gpsPointInterval=Intervalle %1$td/%1$tm/%1$tY %1$tH\:%1$tM\:%1$tS - %2$td/%2$tm/%2$tY %2$tH\:%2$tM\:%2$tM ( nombre de point(s) \: %3$s ) -observe.common.ownership.autreVessel=Navire d'un autre armement -observe.common.ownership.ceVessel=Ce navire ou cet armement -observe.common.ownership.unknown=Inconnue +observe.common.oldCode3L=ancien code \: observe.common.quadrant=Quadrant -observe.common.reference.gearType.longline=Longline -observe.common.reference.gearType.seine=Seine -observe.common.reference.status.disabled=Désactivé -observe.common.reference.status.enabled=Activé +observe.computedValueSource.fromData=calculé à partir des autres données +observe.computedValueSource.fromReferentiel=calculé à partir du référentiel +observe.computedValueSource.fromSample=calculé à partir des échantillons observe.map.longLine.activity=point d'activité observe.map.longLine.activity.hauling.end=Fin de virage observe.map.longLine.activity.hauling.start=Début de virage @@ -20,18 +21,17 @@ observe.map.longLine.activity.station=Station océanographique observe.map.longLine.seine.harbour=Au port observe.map.seine.activity=point d'activité observe.map.seine.activity.inHarbour=Au port -observe.map.seine.activity.schollType.free=Banc libre -observe.map.seine.activity.schollType.object=Banc objet +observe.map.seine.activity.schoolType.free=Banc libre +observe.map.seine.activity.schoolType.object=Banc objet observe.map.seine.harbour.departure=Port de départ observe.map.seine.harbour.landing=Port d'arrivée -observe.persistence.balise.objectOperation.no.balise=Pas de balise liée au DCP -observe.persistence.balise.objectOperation.pose=Pose d'une nouvelle balise -observe.persistence.balise.objectOperation.recupere=Récupération d'une balise sans remise à l'eau -observe.persistence.balise.objectOperation.recupere.et.change=Récupération et pose d'une nouvelle balise -observe.persistence.balise.objectOperation.visite=Simple visite de la balise -observe.persistence.computedValueSource.fromData=calculé à partir des autres données -observe.persistence.computedValueSource.fromReferentiel=calculé à partir du référentiel -observe.persistence.oldCode3L=ancien code \: -observe.persistence.schoolType.libre=Banc libre -observe.persistence.schoolType.objet=Banc objet -observe.persistence.schoolType.undefined=Banc indéterminé +observe.ownership.autreVessel=Navire d'un autre armement +observe.ownership.ceVessel=Ce navire ou cet armement +observe.ownership.unknown=Inconnue +observe.reference.gearType.longline=Longline +observe.reference.gearType.seine=Seine +observe.reference.status.disabled=Désactivé +observe.reference.status.enabled=Activé +observe.schoolType.libre=Banc libre +observe.schoolType.objet=Banc objet +observe.schoolType.undefined=Banc indéterminé diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/constants/ReferenceStatus.java b/observe-services-model/src/main/java/fr/ird/observe/services/dto/constants/ReferenceStatus.java index 166a458..445e694 100644 --- a/observe-services-model/src/main/java/fr/ird/observe/services/dto/constants/ReferenceStatus.java +++ b/observe-services-model/src/main/java/fr/ird/observe/services/dto/constants/ReferenceStatus.java @@ -35,10 +35,10 @@ import static org.nuiton.i18n.I18n.t; public enum ReferenceStatus { /** status desactive */ - disabled(n("observe.common.reference.status.disabled")), + disabled(n("observe.reference.status.disabled")), /** status active */ - enabled(n("observe.common.reference.status.enabled")); + enabled(n("observe.reference.status.enabled")); private String i18nKey; diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/constants/TripMapPointType.java b/observe-services-model/src/main/java/fr/ird/observe/services/dto/constants/TripMapPointType.java index a604760..f686560 100644 --- a/observe-services-model/src/main/java/fr/ird/observe/services/dto/constants/TripMapPointType.java +++ b/observe-services-model/src/main/java/fr/ird/observe/services/dto/constants/TripMapPointType.java @@ -34,8 +34,8 @@ public enum TripMapPointType { SEINE_LANDING_HARBOUR(n("observe.map.seine.harbour.landing")), SEINE_ACTIVITY(n("observe.map.seine.activity")), SEINE_ACTIVITY_IN_HARBOUR(n("observe.map.seine.activity.inHarbour")), - SEINE_ACTIVITY_WITH_FREE_SCHOOL_TYPE(n("observe.map.seine.activity.schollType.free")), - SEINE_ACTIVITY_WITH_OBJECT_SCHOOL_TYPE(n("observe.map.seine.activity.schollType.object")), + SEINE_ACTIVITY_WITH_FREE_SCHOOL_TYPE(n("observe.map.seine.activity.schoolType.free")), + SEINE_ACTIVITY_WITH_OBJECT_SCHOOL_TYPE(n("observe.map.seine.activity.schoolType.object")), LONGLINE_IN_HARBOUR(n("observe.map.longLine.seine.harbour")), LONGLINE_ACTIVITY(n("observe.map.longLine.activity")), -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.