branch develop updated (94e9979 -> 99ebd67)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git from 94e9979 Correction de traduction pour une enum new 99ebd67 Fix i18n enum... The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 99ebd67ac1fc38174f8042c6451b0f87d9fbc71a Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Sep 1 09:54:12 2016 +0200 Fix i18n enum... Summary of changes: application-swing/pom.xml | 1 - .../synchronize/referential/ReferentialSynchronizeMode.java | 9 ++++++++- .../referential/ng/ReferentialSynchroConfigUI.jaxx | 2 +- .../main/resources/i18n/application-swing_en_GB.properties | 12 +++--------- .../main/resources/i18n/application-swing_es_ES.properties | 12 +++--------- .../main/resources/i18n/application-swing_fr_FR.properties | 12 +++--------- 6 files changed, 18 insertions(+), 30 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
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 99ebd67ac1fc38174f8042c6451b0f87d9fbc71a Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Sep 1 09:54:12 2016 +0200 Fix i18n enum... --- application-swing/pom.xml | 1 - .../synchronize/referential/ReferentialSynchronizeMode.java | 9 ++++++++- .../referential/ng/ReferentialSynchroConfigUI.jaxx | 2 +- .../main/resources/i18n/application-swing_en_GB.properties | 12 +++--------- .../main/resources/i18n/application-swing_es_ES.properties | 12 +++--------- .../main/resources/i18n/application-swing_fr_FR.properties | 12 +++--------- 6 files changed, 18 insertions(+), 30 deletions(-) diff --git a/application-swing/pom.xml b/application-swing/pom.xml index 06884dd..795de81 100644 --- a/application-swing/pom.xml +++ b/application-swing/pom.xml @@ -417,7 +417,6 @@ <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> - <enum>fr.ird.observe.services.service.actions.synchro.referential.ReferentialSynchronizeMode</enum> </enums> </configuration> </execution> diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ReferentialSynchronizeMode.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ReferentialSynchronizeMode.java index e053b37..c97eef3 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ReferentialSynchronizeMode.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ReferentialSynchronizeMode.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.service.actions.synchro.referential; +package fr.ird.observe.application.swing.ui.admin.synchronize.referential; /*- * #%L @@ -23,6 +23,8 @@ package fr.ird.observe.services.service.actions.synchro.referential; */ +import static org.nuiton.i18n.I18n.n; + /** * Type de synchronisation de référentiel. Définit quelles bases sont en écriture. * @@ -68,4 +70,9 @@ public enum ReferentialSynchronizeMode { return rightWrite; } + static { + n("observe.enum.fr.ird.observe.application.swing.ui.admin.synchronize.referential.ReferentialSynchronizeMode.FROM_LEFT_TO_RIGHT"); + n("observe.enum.fr.ird.observe.application.swing.ui.admin.synchronize.referential.ReferentialSynchronizeMode.FROM_RIGHT_TO_LEFT"); + n("observe.enum.fr.ird.observe.application.swing.ui.admin.synchronize.referential.ReferentialSynchronizeMode.BOTH"); + } } diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/ReferentialSynchroConfigUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/ReferentialSynchroConfigUI.jaxx index 4dae2e2..70af507 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/ReferentialSynchroConfigUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/ReferentialSynchroConfigUI.jaxx @@ -27,7 +27,7 @@ <import> fr.ird.observe.application.swing.configuration.ObserveSwingApplicationConfig - fr.ird.observe.services.service.actions.synchro.referential.ReferentialSynchronizeMode + fr.ird.observe.application.swing.ui.admin.synchronize.referential.ReferentialSynchronizeMode fr.ird.observe.application.swing.I18nEnumHelper fr.ird.observe.application.swing.ui.admin.AdminUIModel fr.ird.observe.application.swing.validation.ValidationModelMode diff --git a/application-swing/src/main/resources/i18n/application-swing_en_GB.properties b/application-swing/src/main/resources/i18n/application-swing_en_GB.properties index 4c5b358..26e155b 100644 --- a/application-swing/src/main/resources/i18n/application-swing_en_GB.properties +++ b/application-swing/src/main/resources/i18n/application-swing_en_GB.properties @@ -273,12 +273,6 @@ observe.actions.synchro.referential.message.referentiel.was.removed=Referential observe.actions.synchro.referential.message.referentiel.was.replaced=Referential (type %1$s) were replaced to remote (%2$d object(s)) observe.actions.synchro.referential.message.saveLocal.skip=Save operation is not required. observe.actions.synchro.referential.message.synchro.local.modification=Some referential were modified, local database save is required. -observe.actions.synchro.referential.mode.both=Both ways -observe.actions.synchro.referential.mode.both.description=Synchronise referentials in both ways -observe.actions.synchro.referential.mode.fromLeftToRight=From left source to right source -observe.actions.synchro.referential.mode.fromLeftToRight.description=Synchronise referentials from left source to right source -observe.actions.synchro.referential.mode.fromRightToLeft=From right source to left source -observe.actions.synchro.referential.mode.fromRightToLeft.description=Synchronise referentials from right source to left source observe.actions.synchro.referential.obsolete.entities.list=Disabled referential list observe.actions.synchro.referential.obsolete.entity.fix=Change references of selected referential observe.actions.synchro.referential.replaceBefore.message=<html><body>Choose replace referential for <i>%s</i> \: <b>%s</b>.<br/><br/> @@ -1805,6 +1799,9 @@ observe.converter.error.float.format=Decimal format not correct for value %s observe.converter.error.no.convertor=could not convert decimal %s using convertor %s observe.converter.error.noValue=No value to convert using convertor %s observe.entity.message.updating=object '%1$s' is in editing mode. +observe.enum.fr.ird.observe.application.swing.ui.admin.synchronize.referential.ReferentialSynchronizeMode.BOTH=Bi directionnal +observe.enum.fr.ird.observe.application.swing.ui.admin.synchronize.referential.ReferentialSynchronizeMode.FROM_LEFT_TO_RIGHT=From left to right +observe.enum.fr.ird.observe.application.swing.ui.admin.synchronize.referential.ReferentialSynchronizeMode.FROM_RIGHT_TO_LEFT=From right to left observe.enum.fr.ird.observe.application.swing.ui.content.ref.impl.ProgramObservationEnum.value0=observed observe.enum.fr.ird.observe.application.swing.ui.content.ref.impl.ProgramObservationEnum.value1=non observed observe.enum.fr.ird.observe.application.swing.ui.content.ref.impl.ProgramObservationEnum.value2=value not defined @@ -1856,9 +1853,6 @@ observe.enum.fr.ird.observe.services.dto.constants.seine.TypeTransmittingBuoyOpe observe.enum.fr.ird.observe.services.dto.constants.seine.TypeTransmittingBuoyOperation.recuperation=Grab observe.enum.fr.ird.observe.services.dto.constants.seine.TypeTransmittingBuoyOperation.recuperationEtRemplacement=Grab and change observe.enum.fr.ird.observe.services.dto.constants.seine.TypeTransmittingBuoyOperation.visite=Visit -observe.enum.fr.ird.observe.services.service.actions.synchro.referential.ReferentialSynchronizeMode.BOTH=Bi directionnal -observe.enum.fr.ird.observe.services.service.actions.synchro.referential.ReferentialSynchronizeMode.FROM_LEFT_TO_RIGHT=From left to right -observe.enum.fr.ird.observe.services.service.actions.synchro.referential.ReferentialSynchronizeMode.FROM_RIGHT_TO_LEFT=From right to left observe.error.can.not.create.directory=Can't create directory %&$s\! observe.error.no.activity.6=Activity of type 6 was not found. observe.error.storage.could.not.backup.unsane.local.db=Can not save an borken database diff --git a/application-swing/src/main/resources/i18n/application-swing_es_ES.properties b/application-swing/src/main/resources/i18n/application-swing_es_ES.properties index eac267e..226c583 100644 --- a/application-swing/src/main/resources/i18n/application-swing_es_ES.properties +++ b/application-swing/src/main/resources/i18n/application-swing_es_ES.properties @@ -273,12 +273,6 @@ observe.actions.synchro.referential.message.referentiel.was.removed=Se han elimi observe.actions.synchro.referential.message.referentiel.was.replaced=Se han remplazado datos (type %1$s) en el referencial local (%2$d objet(s)) observe.actions.synchro.referential.message.saveLocal.skip=No es necesario realizar copia de seguidad de la base local observe.actions.synchro.referential.message.synchro.local.modification=Se han modificados datos, la base local debe ser guardada. -observe.actions.synchro.referential.mode.both=Bidiriccional -observe.actions.synchro.referential.mode.both.description=Sincronización bidiriccional de los referenciales -observe.actions.synchro.referential.mode.fromLeftToRight=De la izquierda a la derecha -observe.actions.synchro.referential.mode.fromLeftToRight.description=Sincronización de los referenciales desde la fuente de la izquierda hacia la fuente de la derecha -observe.actions.synchro.referential.mode.fromRightToLeft=De la derecha a la izquierda -observe.actions.synchro.referential.mode.fromRightToLeft.description=Sincronización de los referenciales desde la fuente de la derecha hacia la fuente de la izquierda observe.actions.synchro.referential.obsolete.entities.list=Lista de los entidades del referencial que son obsoletas observe.actions.synchro.referential.obsolete.entity.fix=Cambiar las referencias del objeto seleccionado observe.actions.synchro.referential.replaceBefore.message=<html><body>Elegir un referencial de reemplazo de <i>%s</i> \: <b>%s</b>.<br/><br/> @@ -1805,6 +1799,9 @@ observe.converter.error.float.format=Formato de decimal incorrecto para el valor observe.converter.error.no.convertor=Impossible de convertir el decimal %s con el convertidor %s observe.converter.error.noValue=Ningún valor necesita ser convertida con el convertidor %s observe.entity.message.updating=Se está modificando el objeto actual '%1$s'. +observe.enum.fr.ird.observe.application.swing.ui.admin.synchronize.referential.ReferentialSynchronizeMode.BOTH=Bidireccional +observe.enum.fr.ird.observe.application.swing.ui.admin.synchronize.referential.ReferentialSynchronizeMode.FROM_LEFT_TO_RIGHT=De izquierda a derecha +observe.enum.fr.ird.observe.application.swing.ui.admin.synchronize.referential.ReferentialSynchronizeMode.FROM_RIGHT_TO_LEFT=De derecha a izquierda observe.enum.fr.ird.observe.application.swing.ui.content.ref.impl.ProgramObservationEnum.value0=no observado observe.enum.fr.ird.observe.application.swing.ui.content.ref.impl.ProgramObservationEnum.value1=observado observe.enum.fr.ird.observe.application.swing.ui.content.ref.impl.ProgramObservationEnum.value2=valor 2 no definido @@ -1856,9 +1853,6 @@ observe.enum.fr.ird.observe.services.dto.constants.seine.TypeTransmittingBuoyOpe observe.enum.fr.ird.observe.services.dto.constants.seine.TypeTransmittingBuoyOperation.recuperation=Recogida de baliza sin regreso al agua observe.enum.fr.ird.observe.services.dto.constants.seine.TypeTransmittingBuoyOperation.recuperationEtRemplacement=Recuperación y colocación de una nueva baliza observe.enum.fr.ird.observe.services.dto.constants.seine.TypeTransmittingBuoyOperation.visite=Visita a la baliza -observe.enum.fr.ird.observe.services.service.actions.synchro.referential.ReferentialSynchronizeMode.BOTH=Bidireccional -observe.enum.fr.ird.observe.services.service.actions.synchro.referential.ReferentialSynchronizeMode.FROM_LEFT_TO_RIGHT=De izquierda a derecha -observe.enum.fr.ird.observe.services.service.actions.synchro.referential.ReferentialSynchronizeMode.FROM_RIGHT_TO_LEFT=De derecha a izquierda observe.error.can.not.create.directory=¡Imposible crear el directorio %1$s\! observe.error.no.activity.6=La actividad con código 6 no se ha encontrado en la base de datos. observe.error.storage.could.not.backup.unsane.local.db=Impossible grabar una base dañada diff --git a/application-swing/src/main/resources/i18n/application-swing_fr_FR.properties b/application-swing/src/main/resources/i18n/application-swing_fr_FR.properties index ba5a3af..48b17a0 100644 --- a/application-swing/src/main/resources/i18n/application-swing_fr_FR.properties +++ b/application-swing/src/main/resources/i18n/application-swing_fr_FR.properties @@ -273,12 +273,6 @@ observe.actions.synchro.referential.message.referentiel.was.removed=Des données observe.actions.synchro.referential.message.referentiel.was.replaced=Des données (type %1$s) ont été remplacées dans le référentiel local (%2$d objet(s)) observe.actions.synchro.referential.message.saveLocal.skip=L'opération de sauvegarde de la base locale n'est pas requise. observe.actions.synchro.referential.message.synchro.local.modification=Des données ont été modifiées et la base locale doit être sauvée. -observe.actions.synchro.referential.mode.both=Bi-directionnelle -observe.actions.synchro.referential.mode.both.description=Synchronisation bi-directionnelle des référentiels -observe.actions.synchro.referential.mode.fromLeftToRight=Depuis la source de gauche vers celle de droite -observe.actions.synchro.referential.mode.fromLeftToRight.description=Synchronisation Référentiel depuis la source de gauche vers celle de droite -observe.actions.synchro.referential.mode.fromRightToLeft=Depuis la source de droite à la source de gauche -observe.actions.synchro.referential.mode.fromRightToLeft.description=Synchronisation Référentiel depuis la source de droite vers celle de gauche observe.actions.synchro.referential.obsolete.entities.list=Liste des entités du référentiel obsolètes observe.actions.synchro.referential.obsolete.entity.fix=Changer les références sur l'objet sélectionné observe.actions.synchro.referential.replaceBefore.message=<html><body>Choisir un référentiel de remplacement de <i>%s</i> \: <b>%s</b>.<br/><br/> @@ -1805,6 +1799,9 @@ 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.fr.ird.observe.application.swing.ui.admin.synchronize.referential.ReferentialSynchronizeMode.BOTH=Bi directionnel +observe.enum.fr.ird.observe.application.swing.ui.admin.synchronize.referential.ReferentialSynchronizeMode.FROM_LEFT_TO_RIGHT=De la gauche vers la droite +observe.enum.fr.ird.observe.application.swing.ui.admin.synchronize.referential.ReferentialSynchronizeMode.FROM_RIGHT_TO_LEFT=De la droite vers la gauche observe.enum.fr.ird.observe.application.swing.ui.content.ref.impl.ProgramObservationEnum.value0=non observé observe.enum.fr.ird.observe.application.swing.ui.content.ref.impl.ProgramObservationEnum.value1=observé observe.enum.fr.ird.observe.application.swing.ui.content.ref.impl.ProgramObservationEnum.value2=valeur 2 non définie @@ -1856,9 +1853,6 @@ observe.enum.fr.ird.observe.services.dto.constants.seine.TypeTransmittingBuoyOpe 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.enum.fr.ird.observe.services.service.actions.synchro.referential.ReferentialSynchronizeMode.BOTH=Bi directionnel -observe.enum.fr.ird.observe.services.service.actions.synchro.referential.ReferentialSynchronizeMode.FROM_LEFT_TO_RIGHT=De la gauche vers la droite -observe.enum.fr.ird.observe.services.service.actions.synchro.referential.ReferentialSynchronizeMode.FROM_RIGHT_TO_LEFT=De la droite vers la gauche 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 -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm