branch develop updated (5b83788 -> 94e9979)
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 5b83788 Corrige les chaines i18n manquantes pour la gestion avancée des referentiels new 94e9979 Correction de traduction pour une 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 94e99790420e172518c8a5aa9de768d2f57a7df4 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Aug 31 18:45:37 2016 +0200 Correction de traduction pour une enum Summary of changes: application-swing/pom.xml | 1 + .../application/swing/ui/admin/AdminUIModel.java | 3 ++- .../referential/ReferentialSynchronizeMode.java | 30 ++++------------------ .../referential/ng/ReferentialSynchroConfigUI.jaxx | 3 ++- .../referential/ng/ReferentialSynchroConfigUI.jcss | 6 ++--- .../i18n/application-swing_en_GB.properties | 3 +++ .../i18n/application-swing_es_ES.properties | 3 +++ .../i18n/application-swing_fr_FR.properties | 3 +++ 8 files changed, 22 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 94e99790420e172518c8a5aa9de768d2f57a7df4 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Aug 31 18:45:37 2016 +0200 Correction de traduction pour une enum --- application-swing/pom.xml | 1 + .../application/swing/ui/admin/AdminUIModel.java | 3 ++- .../referential/ReferentialSynchronizeMode.java | 30 ++++------------------ .../referential/ng/ReferentialSynchroConfigUI.jaxx | 3 ++- .../referential/ng/ReferentialSynchroConfigUI.jcss | 6 ++--- .../i18n/application-swing_en_GB.properties | 3 +++ .../i18n/application-swing_es_ES.properties | 3 +++ .../i18n/application-swing_fr_FR.properties | 3 +++ 8 files changed, 22 insertions(+), 30 deletions(-) diff --git a/application-swing/pom.xml b/application-swing/pom.xml index 795de81..06884dd 100644 --- a/application-swing/pom.xml +++ b/application-swing/pom.xml @@ -417,6 +417,7 @@ <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/AdminUIModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/AdminUIModel.java index 8fac8f1..0b620fb 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/AdminUIModel.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/AdminUIModel.java @@ -22,6 +22,7 @@ package fr.ird.observe.application.swing.ui.admin; import com.google.common.collect.Lists; +import fr.ird.observe.application.swing.I18nEnumHelper; import fr.ird.observe.application.swing.ObserveSwingApplicationContext; import fr.ird.observe.application.swing.configuration.ObserveSwingApplicationConfig; import fr.ird.observe.application.swing.db.ObserveSwingDataSource; @@ -646,7 +647,7 @@ public class AdminUIModel extends WizardExtModel<AdminStep> { ReferentialSynchronizeMode newValue = (ReferentialSynchronizeMode) evt.getNewValue(); if (ui.getTabs().getComponentCount() > 1 && newValue != null) { - ui.getTabs().setTitleAt(1, t("observe.actions.synchro.referential.withMode", newValue.getLabel())); + ui.getTabs().setTitleAt(1, t("observe.actions.synchro.referential.withMode", I18nEnumHelper.getLabel(newValue))); } }); 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 f10c724..e053b37 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.application.swing.ui.admin.synchronize.referential; +package fr.ird.observe.services.service.actions.synchro.referential; /*- * #%L @@ -22,8 +22,6 @@ package fr.ird.observe.application.swing.ui.admin.synchronize.referential; * #L% */ -import static org.nuiton.i18n.I18n.n; -import static org.nuiton.i18n.I18n.t; /** * Type de synchronisation de référentiel. Définit quelles bases sont en écriture. @@ -38,20 +36,15 @@ public enum ReferentialSynchronizeMode { /** * La base de gauche est en lecture, la base de droite est en écriture. */ - FROM_LEFT_TO_RIGHT(false, true, - n("observe.actions.synchro.referential.mode.fromLeftToRight"), - n("observe.actions.synchro.referential.mode.fromLeftToRight.description")), + FROM_LEFT_TO_RIGHT(false, true), /** * La base de gauche est en écriture, la base de droite est en lecture. */ - FROM_RIGHT_TO_LEFT(true, false,n("observe.actions.synchro.referential.mode.fromRightToLeft"), - n("observe.actions.synchro.referential.mode.fromRightToLeft.description")), + FROM_RIGHT_TO_LEFT(true, false), /** * La base de gauche est en écriture, la base de droite est en écriture. */ - BOTH(true, true, - n("observe.actions.synchro.referential.mode.both"), - n("observe.actions.synchro.referential.mode.both.description")),; + BOTH(true, true); /** * Est ce que la source de gauche est en écriture ? @@ -62,15 +55,9 @@ public enum ReferentialSynchronizeMode { */ private final boolean rightWrite; - private final String label; - - private final String description; - - ReferentialSynchronizeMode(boolean leftWrite, boolean rightWrite, String label, String description) { + ReferentialSynchronizeMode(boolean leftWrite, boolean rightWrite) { this.leftWrite = leftWrite; this.rightWrite = rightWrite; - this.label = label; - this.description = description; } public boolean isLeftWrite() { @@ -81,11 +68,4 @@ public enum ReferentialSynchronizeMode { return rightWrite; } - public String getLabel() { - return t(label); - } - - public String getDescription() { - return t(description); - } } 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 7a664ce..4dae2e2 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,8 @@ <import> fr.ird.observe.application.swing.configuration.ObserveSwingApplicationConfig - fr.ird.observe.application.swing.ui.admin.synchronize.referential.ReferentialSynchronizeMode + fr.ird.observe.services.service.actions.synchro.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/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/ReferentialSynchroConfigUI.jcss b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/ReferentialSynchroConfigUI.jcss index 3d0ed48..36cfec6 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/ReferentialSynchroConfigUI.jcss +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/ReferentialSynchroConfigUI.jcss @@ -34,21 +34,21 @@ #BOTH{ buttonGroup:"synchronizeMode"; value:{ReferentialSynchronizeMode.BOTH}; - text:{ReferentialSynchronizeMode.BOTH.getLabel()}; + text:{I18nEnumHelper.getLabel(ReferentialSynchronizeMode.BOTH)}; selected:{ReferentialSynchronizeMode.BOTH == stepModel.getSynchronizeMode()}; } #RIGHT_TO_LEFT { buttonGroup:"synchronizeMode"; value:{ReferentialSynchronizeMode.FROM_RIGHT_TO_LEFT}; - text:{ReferentialSynchronizeMode.FROM_RIGHT_TO_LEFT.getLabel()}; + text:{I18nEnumHelper.getLabel(ReferentialSynchronizeMode.FROM_RIGHT_TO_LEFT)}; selected:{ReferentialSynchronizeMode.FROM_RIGHT_TO_LEFT == stepModel.getSynchronizeMode()}; } #LEFT_TO_RIGHT { buttonGroup:"synchronizeMode"; value:{ReferentialSynchronizeMode.FROM_LEFT_TO_RIGHT}; - text:{ReferentialSynchronizeMode.FROM_LEFT_TO_RIGHT.getLabel()}; + text:{I18nEnumHelper.getLabel(ReferentialSynchronizeMode.FROM_LEFT_TO_RIGHT)}; selected:{ReferentialSynchronizeMode.FROM_LEFT_TO_RIGHT == stepModel.getSynchronizeMode()}; } 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 b87171e..4c5b358 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 @@ -1856,6 +1856,9 @@ 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 ad28495..eac267e 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 @@ -1856,6 +1856,9 @@ 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 9375499..ba5a3af 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 @@ -1856,6 +1856,9 @@ 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