branch develop updated (5774893 -> 8022090)
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 5774893 Fix generated webmotion mapping new 8022090 Correction de l'affichage d'une enum (nécessite i18n 3.6.2) 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 8022090b1e4c0bdf8ae40dc8cc88ef8f6c9a62f6 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Sep 7 11:20:12 2016 +0200 Correction de l'affichage d'une enum (nécessite i18n 3.6.2) Summary of changes: .../ird/observe/application/swing/ui/storage/ObstunaAdminAction.java | 5 +++++ .../src/main/resources/ftl/dataSourceConnectionReport_fr.ftl | 2 +- pom.xml | 2 +- 3 files changed, 7 insertions(+), 2 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 8022090b1e4c0bdf8ae40dc8cc88ef8f6c9a62f6 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Sep 7 11:20:12 2016 +0200 Correction de l'affichage d'une enum (nécessite i18n 3.6.2) --- .../ird/observe/application/swing/ui/storage/ObstunaAdminAction.java | 5 +++++ .../src/main/resources/ftl/dataSourceConnectionReport_fr.ftl | 2 +- pom.xml | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/ObstunaAdminAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/ObstunaAdminAction.java index 9c8bf96..49ce7be 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/ObstunaAdminAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/ObstunaAdminAction.java @@ -315,4 +315,9 @@ public enum ObstunaAdminAction { } public abstract RemoteUILauncher newLauncher(JAXXContext context, Window frame); + + @Override + public String toString() { + return I18nEnumHelper.getLabel(this); + } } diff --git a/application-swing/src/main/resources/ftl/dataSourceConnectionReport_fr.ftl b/application-swing/src/main/resources/ftl/dataSourceConnectionReport_fr.ftl index b2895de..0d21869 100644 --- a/application-swing/src/main/resources/ftl/dataSourceConnectionReport_fr.ftl +++ b/application-swing/src/main/resources/ftl/dataSourceConnectionReport_fr.ftl @@ -270,7 +270,7 @@ <#else> - <h2>${adminAction.label}</h2> + <h2>${adminAction}</h2> <hr/> <h3>Informations sur le serveur distant à utiliser :</h3> diff --git a/pom.xml b/pom.xml index 0ff63a8..b2add63 100644 --- a/pom.xml +++ b/pom.xml @@ -163,7 +163,7 @@ <topiaVersion>3.1.3</topiaVersion> <jaxxVersion>2.31</jaxxVersion> - <nuitonI18nVersion>3.6.1</nuitonI18nVersion> + <nuitonI18nVersion>3.6.2</nuitonI18nVersion> <nuitonValidatorVersion>3.0.1</nuitonValidatorVersion> <nuitonUtilsVersion>3.0-rc-15</nuitonUtilsVersion> <xworkVersion>2.3.30</xworkVersion> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm