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 0a38d0d5f867d14fc2b4028d6e0833adae02fd0c Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Aug 29 11:35:43 2015 +0200 Ajout et nettoyage des clefs sur le module de persistence --- .../seine/NonTargetCatchComputedValueSource.java | 6 +++--- .../entities/constants/seine/SchoolType.java | 6 +++--- .../seine/TypeTransmittingBuoyOperation.java | 10 ++++----- .../i18n/observe-entities_en_GB.properties | 23 ++++++++++---------- .../i18n/observe-entities_es_ES.properties | 25 +++++++++++----------- .../i18n/observe-entities_fr_FR.properties | 23 ++++++++++---------- observe-services-topia/pom.xml | 23 ++++++++++++++++++++ .../i18n/observe-services-topia_en_GB.properties | 2 ++ .../i18n/observe-services-topia_es_ES.properties | 2 ++ .../i18n/observe-services-topia_fr_FR.properties | 2 ++ 10 files changed, 75 insertions(+), 47 deletions(-) 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 6937354..948f66c 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,7 +38,7 @@ public enum NonTargetCatchComputedValueSource { * * @since 3.0 */ - FROM_DATA(n("observe.common.computedValueSource.fromData")), + FROM_DATA(n("observe.persistence.computedValueSource.fromData")), /** * Donnée calculée à partir de l'échantillon pour la même espèce et la même calée. * @@ -50,11 +50,11 @@ public enum NonTargetCatchComputedValueSource { * * @since 3.0 */ - FROM_REFERENTIEL(n("observe.common.computedValueSource.fromReferentiel")); + FROM_REFERENTIEL(n("observe.persistence.computedValueSource.fromReferentiel")); private final String i18nKey; - private NonTargetCatchComputedValueSource(String i18nKey) { + NonTargetCatchComputedValueSource(String i18nKey) { this.i18nKey = 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 3241a84..0c74c0b 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.common.schoolType.undefined")), + undefined(n("observe.persistence.schoolType.undefined")), /** banc objet // was 1 before version 4.0 */ - objet(n("observe.common.schoolType.objet")), + objet(n("observe.persistence.schoolType.objet")), /** banc libre // was 2 before version 4.0 */ - libre(n("observe.common.schoolType.libre")); + libre(n("observe.persistence.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 7f5732f..75516b8 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.common.balise.objectOperation.no.balise")), + pasDeBalise(n("observe.persistence.balise.objectOperation.no.balise")), // une balise lue - visite(n("observe.common.balise.objectOperation.visite"), "1"), - recuperation(n("observe.common.balise.objectOperation.recupere"), "2"), - pose(n("observe.common.balise.objectOperation.pose"), "3"), + visite(n("observe.persistence.balise.objectOperation.visite"), "1"), + recuperation(n("observe.persistence.balise.objectOperation.recupere"), "2"), + pose(n("observe.persistence.balise.objectOperation.pose"), "3"), // deux balises lues - recuperationEtRemplacement(n("observe.common.balise.objectOperation.recupere.et.change"), "2", "3"); + recuperationEtRemplacement(n("observe.persistence.balise.objectOperation.recupere.et.change"), "2", "3"); /** clef i18n du type d'opération sur balise */ private String i18nKey; 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 d38c4e5..fd9fc16 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,10 +1,3 @@ -observe.common.balise.objectOperation.no.balise= -observe.common.balise.objectOperation.pose= -observe.common.balise.objectOperation.recupere= -observe.common.balise.objectOperation.recupere.et.change= -observe.common.balise.objectOperation.visite= -observe.common.computedValueSource.fromData= -observe.common.computedValueSource.fromReferentiel= observe.common.computedValueSource.fromSample= observe.common.endDate= observe.common.endPursingDate= @@ -17,9 +10,6 @@ observe.common.reference.gearType.longline= observe.common.reference.gearType.seine= observe.common.reference.status.disabled= observe.common.reference.status.enabled= -observe.common.schoolType.libre= -observe.common.schoolType.objet= -observe.common.schoolType.undefined= observe.map.longLine.activity= observe.map.longLine.activity.hauling.end= observe.map.longLine.activity.hauling.start= @@ -28,14 +18,23 @@ observe.map.longLine.activity.setting.end= observe.map.longLine.activity.setting.start= observe.map.longLine.activity.station= observe.map.longLine.seine.harbour= -observe.map.longLine.seine.harbour.departure= -observe.map.longLine.seine.harbour.landing= 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.storage.migrate.askUser.message=Database use version %1$s,\n\nYou need to migrate to version %2$s.\nWould you like to execute migration ?\n\nNote\: Following migrations will be applied\: %3$s. observe.storage.migrate.askUser.title=Database update to version %1$s is required observe.storage.migrate.not.possible.before.version.3.0.message=<html><body>The application version requires a database in minimum version <strong>3.0</strong>. You database is actually in version %s<br/>Do first a migration using ObServe 3.0 or 3.1, you will then be able to migrate your database using this version of ObServe</body></html> 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 6e1ff8a..87540c4 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,11 +1,4 @@ -observe.common.balise.objectOperation.no.balise=DCP sin balizar -observe.common.balise.objectOperation.pose=Colocación de nueva baliza -observe.common.balise.objectOperation.recupere=Recogida de baliza sin regreso al agua -observe.common.balise.objectOperation.recupere.et.change=Recuperación y colocación de una nueva baliza -observe.common.balise.objectOperation.visite=Visita a la baliza -observe.common.computedValueSource.fromData=Calculado a partir de otros datos -observe.common.computedValueSource.fromReferentiel=Calculado a partir del Referencial -observe.common.computedValueSource.fromSample=Calculado a partir de las muestras +observe.common.computedValueSource.fromSample= 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 ) @@ -17,9 +10,6 @@ observe.common.reference.gearType.longline=Senne observe.common.reference.gearType.seine= observe.common.reference.status.disabled=Desactivado observe.common.reference.status.enabled=Activado -observe.common.schoolType.libre=Banco libre -observe.common.schoolType.objet=Banco a objeto -observe.common.schoolType.undefined=Banco indeterminado observe.map.longLine.activity= observe.map.longLine.activity.hauling.end= observe.map.longLine.activity.hauling.start= @@ -28,14 +18,23 @@ observe.map.longLine.activity.setting.end= observe.map.longLine.activity.setting.start= observe.map.longLine.activity.station= observe.map.longLine.seine.harbour= -observe.map.longLine.seine.harbour.departure= -observe.map.longLine.seine.harbour.landing= 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=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.storage.migrate.askUser.message=La base de datos tiene la versión %1$s,\n\n Es necesario una migración a la versión %2$s.\n¿Quiere migrar la base de datos ?\n\nNota \: Se aplicarán las siguientes actualizaciones \: %3$s. observe.storage.migrate.askUser.title=Se requiera la actualización de la base de datos a la versión %1$s. observe.storage.migrate.not.possible.before.version.3.0.message=<html><body>La version %s d'ObServe nécessite une base de version au moins <strong>3.0</strong>. Votre base est en version %s<br/>Veuillez dans un premier temps utiliser ObServe 3.0 ou 3.1 pour effectuer la migration puis réouvrir la base avec cette nouvelle version d'ObServe</body></html> 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 7056a1e..5f5de26 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,11 +1,4 @@ -observe.common.balise.objectOperation.no.balise=Pas de balise liée au DCP -observe.common.balise.objectOperation.pose=Pose d'une nouvelle balise -observe.common.balise.objectOperation.recupere=Récupération d'une balise sans remise à l'eau -observe.common.balise.objectOperation.recupere.et.change=Récupération et pose d'une nouvelle balise -observe.common.balise.objectOperation.visite=Simple visite de la balise -observe.common.computedValueSource.fromData=calculé à partir des autres données -observe.common.computedValueSource.fromReferentiel=calculé à partir du référentiel -observe.common.computedValueSource.fromSample=calculé à partir des échantillons +observe.common.computedValueSource.fromSample= 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 ) @@ -17,9 +10,6 @@ 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.common.schoolType.libre=Banc libre -observe.common.schoolType.objet=Banc objet -observe.common.schoolType.undefined=Banc indéterminé 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 @@ -34,6 +24,17 @@ observe.map.seine.activity.schollType.free=Banc libre observe.map.seine.activity.schollType.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.storage.migrate.askUser.message=La base de données est en version %1$s,\n\nUne migration en version %2$s est nécéssaire.\nVoulez vous migrer la base de données ?\n\nNote \: Les mises à jour suivantes seront appliquées \: %3$s. observe.storage.migrate.askUser.title=Mise à jour de la base en version %1$s requise observe.storage.migrate.not.possible.before.version.3.0.message=<html><body>La version %s d'ObServe nécessite une base de version au moins <strong>3.0</strong>. Votre base est en version %s<br/>Veuillez dans un premier temps utiliser ObServe 3.0 ou 3.1 pour effectuer la migration puis réouvrir la base avec cette nouvelle version d'ObServe</body></html> diff --git a/observe-services-topia/pom.xml b/observe-services-topia/pom.xml index d2c914f..53eb6e1 100644 --- a/observe-services-topia/pom.xml +++ b/observe-services-topia/pom.xml @@ -74,6 +74,10 @@ <groupId>org.nuiton</groupId> <artifactId>nuiton-utils</artifactId> </dependency> + <dependency> + <groupId>org.nuiton.i18n</groupId> + <artifactId>nuiton-i18n</artifactId> + </dependency> <!-- persistence --> <!--dependency> @@ -125,5 +129,24 @@ </dependencies> + <build> + + <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> + + </plugins> + </build> + </project> \ No newline at end of file diff --git a/observe-services-topia/src/main/resources/i18n/observe-services-topia_en_GB.properties b/observe-services-topia/src/main/resources/i18n/observe-services-topia_en_GB.properties new file mode 100644 index 0000000..9fff152 --- /dev/null +++ b/observe-services-topia/src/main/resources/i18n/observe-services-topia_en_GB.properties @@ -0,0 +1,2 @@ +observe.service.actions.consolidate.lengthWeightParameterNotFound=No length-weight relation found for tuple (species %s - ocean %s - sex %s - date %s) +observe.service.actions.consolidate.noSex=no sex diff --git a/observe-services-topia/src/main/resources/i18n/observe-services-topia_es_ES.properties b/observe-services-topia/src/main/resources/i18n/observe-services-topia_es_ES.properties new file mode 100644 index 0000000..4021160 --- /dev/null +++ b/observe-services-topia/src/main/resources/i18n/observe-services-topia_es_ES.properties @@ -0,0 +1,2 @@ +observe.service.actions.consolidate.lengthWeightParameterNotFound= +observe.service.actions.consolidate.noSex=no sexo diff --git a/observe-services-topia/src/main/resources/i18n/observe-services-topia_fr_FR.properties b/observe-services-topia/src/main/resources/i18n/observe-services-topia_fr_FR.properties new file mode 100644 index 0000000..200cef6 --- /dev/null +++ b/observe-services-topia/src/main/resources/i18n/observe-services-topia_fr_FR.properties @@ -0,0 +1,2 @@ +observe.service.actions.consolidate.lengthWeightParameterNotFound=Aucune relation taille-poids trouvé pour le tuple (espèce %s - océan %s - sexe %s - date %s) +observe.service.actions.consolidate.noSex=pas de sexe -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.