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 217c441194d31ace7f4c9ec9b02a500fd9e08d01 Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Sep 1 17:15:59 2016 +0200 Use i1_n in snapshot + generate more enums --- .../configuration/constants/CreationMode.java | 71 ++++++---------------- .../swing/configuration/constants/DbMode.java | 39 ++---------- ...pplication-swing-configuration_en_GB.properties | 20 ------ ...pplication-swing-configuration_es_ES.properties | 20 ------ ...pplication-swing-configuration_fr_FR.properties | 20 ------ application-swing/pom.xml | 13 +++- .../swing/ui/storage/tabs/ChooseDbModeUI.jaxx | 1 + .../swing/ui/storage/tabs/ChooseDbModeUI.jcss | 16 ++--- .../swing/ui/storage/tabs/ConfigReferentielUI.jaxx | 1 + .../swing/ui/storage/tabs/ConfigReferentielUI.jcss | 6 +- .../swing/ui/storage/tabs/StorageTabUIHandler.java | 9 +-- .../i18n/application-swing_en_GB.properties | 20 ++++++ .../i18n/application-swing_es_ES.properties | 20 ++++++ .../i18n/application-swing_fr_FR.properties | 20 ++++++ pom.xml | 4 +- 15 files changed, 113 insertions(+), 167 deletions(-) diff --git a/application-swing-configuration/src/main/java/fr/ird/observe/application/swing/configuration/constants/CreationMode.java b/application-swing-configuration/src/main/java/fr/ird/observe/application/swing/configuration/constants/CreationMode.java index c70bf54..81cef22 100644 --- a/application-swing-configuration/src/main/java/fr/ird/observe/application/swing/configuration/constants/CreationMode.java +++ b/application-swing-configuration/src/main/java/fr/ird/observe/application/swing/configuration/constants/CreationMode.java @@ -23,8 +23,6 @@ package fr.ird.observe.application.swing.configuration.constants; import fr.ird.observe.services.dto.DataSourceCreateConfigurationDto; -import static org.nuiton.i18n.I18n.n; - /** * Pour caractériser comment créer une base locale. * @@ -32,63 +30,30 @@ import static org.nuiton.i18n.I18n.n; * @since 1.0 */ public enum CreationMode { - - /** creer une nouvelle base locale vide */ - EMPTY( - n("observe.storage.creationMode.empty"), - n("observe.storage.creationMode.empty.description") - ), - /** creer une nouvelle base a partir du dump embarque */ - IMPORT_INTERNAL_DUMP( - n("observe.storage.creationMode.internalDump"), - n("observe.storage.creationMode.internalDump.description") - ), - /** creer une nouvelle base a partir d'un dump sur fs */ - IMPORT_EXTERNAL_DUMP( - n("observe.storage.creationMode.externalDump"), - n("observe.storage.creationMode.externalDump.description") - ), /** - * creer une nouvelle base vide et importer le referentiel via une base - * locale. + * creer une nouvelle base locale vide */ - IMPORT_LOCAL_STORAGE( - n("observe.storage.creationMode.importLocalStorage"), - n("observe.storage.creationMode.importLocalStorage.description") - ), + EMPTY, /** - * creer une nouvelle base vide et importer le referentiel via une base - * distante. + * creer une nouvelle base a partir du dump embarque */ - IMPORT_REMOTE_STORAGE( - n("observe.storage.creationMode.importRemoteStorage"), - n("observe.storage.creationMode.importRemoteStorage.description") - ), + IMPORT_INTERNAL_DUMP, /** - * creer une nouvelle base vide et importer le referentiel via une base - * distante. + * creer une nouvelle base a partir d'un dump sur fs */ - IMPORT_SERVER_STORAGE( - n("observe.storage.creationMode.importServerStorage"), - n("observe.storage.creationMode.importServerStorage.description") - ); - - private final String label; - - private final String description; - - CreationMode(String label, String description) { - this.label = label; - this.description = description; - } - - public String getLabel() { - return label; - } - - public String getDescription() { - return description; - } + IMPORT_EXTERNAL_DUMP, + /** + * creer une nouvelle base vide et importer le referentiel via une base locale. + */ + IMPORT_LOCAL_STORAGE, + /** + * creer une nouvelle base vide et importer le referentiel via une base distante. + */ + IMPORT_REMOTE_STORAGE, + /** + * creer une nouvelle base vide et importer le referentiel via un serveur distant. + */ + IMPORT_SERVER_STORAGE; public static CreationMode valueOf(DataSourceCreateConfigurationDto createConfigurationDto) { CreationMode result = EMPTY; diff --git a/application-swing-configuration/src/main/java/fr/ird/observe/application/swing/configuration/constants/DbMode.java b/application-swing-configuration/src/main/java/fr/ird/observe/application/swing/configuration/constants/DbMode.java index 3633c5b..e5afbda 100644 --- a/application-swing-configuration/src/main/java/fr/ird/observe/application/swing/configuration/constants/DbMode.java +++ b/application-swing-configuration/src/main/java/fr/ird/observe/application/swing/configuration/constants/DbMode.java @@ -21,8 +21,6 @@ */ package fr.ird.observe.application.swing.configuration.constants; -import static org.nuiton.i18n.I18n.n; - /** * Pour caractériser le type de connexion requis. * @@ -31,40 +29,11 @@ import static org.nuiton.i18n.I18n.n; */ public enum DbMode { /** Pour utiliser une base locale */ - USE_LOCAL( - n("observe.storage.dbMode.useLocal"), - n("observe.storage.dbMode.useLocal.description") - ), + USE_LOCAL, /** Pour creer une base locale */ - CREATE_LOCAL( - n("observe.storage.dbMode.createLocal"), - n("observe.storage.dbMode.createLocal.description") - ), + CREATE_LOCAL, /** Pour utiliser une base distante */ - USE_REMOTE( - n("observe.storage.dbMode.useRemote"), - n("observe.storage.dbMode.useRemote.description") - ), + USE_REMOTE, /** Pour utiliser une base via un serveur web distant */ - USE_SERVER( - n("observe.storage.dbMode.useServer"), - n("observe.storage.dbMode.useServer.description") - ); - - private final String label; - - private final String description; - - DbMode(String label, String description) { - this.label = label; - this.description = description; - } - - public String getLabel() { - return label; - } - - public String getDescription() { - return description; - } + USE_SERVER } diff --git a/application-swing-configuration/src/main/resources/i18n/application-swing-configuration_en_GB.properties b/application-swing-configuration/src/main/resources/i18n/application-swing-configuration_en_GB.properties index 661bca7..ad1605c 100644 --- a/application-swing-configuration/src/main/resources/i18n/application-swing-configuration_en_GB.properties +++ b/application-swing-configuration/src/main/resources/i18n/application-swing-configuration_en_GB.properties @@ -81,24 +81,4 @@ observe.config.ui.treeOpenNodes=Opened data from last session observe.message.save.configuration=Save configuration in file %1$s observe.model.version=Model version observe.runner.config.migrate.file=Le fichier de configuration %1$s a été déplacée de \n%2$s\nvers\n%3$s -observe.storage.creationMode.empty=Generate an empty data base. -observe.storage.creationMode.empty.description=Generate a new empty data base.\nThis database won't any any referential, so you will need to import a referential later to use it. -observe.storage.creationMode.externalDump=Load a database backup (*.sql.gz) -observe.storage.creationMode.externalDump.description=Create a new databse from \na data base backup -observe.storage.creationMode.importLocalStorage=Import referential from a local data base -observe.storage.creationMode.importLocalStorage.description=Generate a new local data bse and import in it the referential of another local data base. -observe.storage.creationMode.importRemoteStorage=Import referential from a remote database -observe.storage.creationMode.importRemoteStorage.description=Generate a new local data base and import in it the referential of a remove database. -observe.storage.creationMode.importServerStorage=Import referential from a remote server -observe.storage.creationMode.importServerStorage.description=Generate a new local data base and import in it the referential of a remove server. -observe.storage.creationMode.internalDump=Load embbeded local database -observe.storage.creationMode.internalDump.description=Generate a new local data base and import in it the referential of the last embbeded database. -observe.storage.dbMode.createLocal=Create a new local database -observe.storage.dbMode.createLocal.description=Create a new local database (type H2) -observe.storage.dbMode.useLocal=Use local database -observe.storage.dbMode.useLocal.description=Use the local database (type H2) -observe.storage.dbMode.useRemote=Use a remote database -observe.storage.dbMode.useRemote.description=Use a remote database (type Postgresql) -observe.storage.dbMode.useServer=Use a remote server -observe.storage.dbMode.useServer.description=Use a remote server (type ObserveWeb) observe.title.config.migrate=Move configuration file diff --git a/application-swing-configuration/src/main/resources/i18n/application-swing-configuration_es_ES.properties b/application-swing-configuration/src/main/resources/i18n/application-swing-configuration_es_ES.properties index 728c45f..881c3bb 100644 --- a/application-swing-configuration/src/main/resources/i18n/application-swing-configuration_es_ES.properties +++ b/application-swing-configuration/src/main/resources/i18n/application-swing-configuration_es_ES.properties @@ -81,24 +81,4 @@ observe.config.ui.treeOpenNodes=Nudos abiertos del arbol abiertos cuando se cerr observe.message.save.configuration=Guardar la configuración en el archivo %1$s observe.model.version=Versión del modelo de datos observe.runner.config.migrate.file=El fichero de configuración %1$s ha sido reemplazado por \n%2$s\nhacia\n%3$s -observe.storage.creationMode.empty=Generar una base vacía -observe.storage.creationMode.empty.description=Generar una nueva base local vacía.\nEsta base no tendrá referencial y usted tendrá que importar lo posteriormente... -observe.storage.creationMode.externalDump=Cargar una copia de seguridad de la base local (*.sql.gz) -observe.storage.creationMode.externalDump.description=Crear una nueva base local a partir\nde una copia de seguridad anterior de la aplicación -observe.storage.creationMode.importLocalStorage=Importar el referencial de una base local -observe.storage.creationMode.importLocalStorage.description=Generar una nueva base local e importar el referencial de una otra base local. -observe.storage.creationMode.importRemoteStorage=Importar el referencial de una base remota -observe.storage.creationMode.importRemoteStorage.description=Generar una nueva base locale e importar el referencial e una otra base remota. -observe.storage.creationMode.importServerStorage=Importar el referencial de un servidor remoto -observe.storage.creationMode.importServerStorage.description=Generar una nueva base local e importar el referencial de un servidor remoto. -observe.storage.creationMode.internalDump=Cargar la base de datos incrustada -observe.storage.creationMode.internalDump.description=Generar una nueva base local a partir\nde la última versión de la base incrustada. -observe.storage.dbMode.createLocal=Crear una base local -observe.storage.dbMode.createLocal.description=Crear una base local de tipo h2 -observe.storage.dbMode.useLocal=Utilizar une base local -observe.storage.dbMode.useLocal.description=Utilizar una base local de tipo h2 -observe.storage.dbMode.useRemote=Utilizar una base remota -observe.storage.dbMode.useRemote.description=Utilizar una base remota de tipo postgres -observe.storage.dbMode.useServer=Utilizar un servidor remoto -observe.storage.dbMode.useServer.description=Utilizar un servidor remoto observe.title.config.migrate=Cambio de la ubicación del archivo de configuración diff --git a/application-swing-configuration/src/main/resources/i18n/application-swing-configuration_fr_FR.properties b/application-swing-configuration/src/main/resources/i18n/application-swing-configuration_fr_FR.properties index 8744e14..fed7bdb 100644 --- a/application-swing-configuration/src/main/resources/i18n/application-swing-configuration_fr_FR.properties +++ b/application-swing-configuration/src/main/resources/i18n/application-swing-configuration_fr_FR.properties @@ -81,24 +81,4 @@ observe.config.ui.treeOpenNodes=Noeuds de l'arbre ouverts lors de la dernière f observe.message.save.configuration=Sauvegarde de la configuration dans le fichier %1$s observe.model.version=Version du modèle de données observe.runner.config.migrate.file=Le fichier de configuration %1$s a été déplacée de \n%2$s\nvers\n%3$s -observe.storage.creationMode.empty=Générer une base vide -observe.storage.creationMode.empty.description=Générer une nouvelle base locale vide.\nCette base n'aura pas de référentiel et il vous faudra ensuite faire un import de référentiel... -observe.storage.creationMode.externalDump=Charger une sauvegarde de base locale (*.sql.gz) -observe.storage.creationMode.externalDump.description=Créer une nouvelle base locale à partir\nd'une précédente sauvegarde de l'application -observe.storage.creationMode.importLocalStorage=Importer le référentiel d'une base locale -observe.storage.creationMode.importLocalStorage.description=Générer une nouvelle base locale et y importer le référentiel d'une autre base locale. -observe.storage.creationMode.importRemoteStorage=Importer le référentiel d'une base distante -observe.storage.creationMode.importRemoteStorage.description=Générer une nouvelle base locale et y importer le référentiel d'une autre base distante. -observe.storage.creationMode.importServerStorage=Importer le référentiel dun serveur distant -observe.storage.creationMode.importServerStorage.description=Générer une nouvelle base locale et y importer le référentiel d'un serveur distant. -observe.storage.creationMode.internalDump=Charger la base embarquée -observe.storage.creationMode.internalDump.description=Générer une nouvelle base locale à partir\nde la dernière version de la base embarquée. -observe.storage.dbMode.createLocal=Créer une base locale -observe.storage.dbMode.createLocal.description=Creer une base locale de type h2 -observe.storage.dbMode.useLocal=Utiliser une base locale -observe.storage.dbMode.useLocal.description=Utiliser une base locale de type h2 -observe.storage.dbMode.useRemote=Utiliser une base distante -observe.storage.dbMode.useRemote.description=Utiliser une base distante de type postgres -observe.storage.dbMode.useServer=Utiliser un serveur distant -observe.storage.dbMode.useServer.description=Utiliser un serveur distant observe.title.config.migrate=Déplacement du fichier de configuration diff --git a/application-swing/pom.xml b/application-swing/pom.xml index 8e8d85f..6e44f66 100644 --- a/application-swing/pom.xml +++ b/application-swing/pom.xml @@ -418,7 +418,7 @@ </goals> <configuration> <prefix>observe.enum.</prefix> - <enums> + <enumsWithLabel> <enum>fr.ird.observe.services.dto.constants.GearType</enum> <enum>fr.ird.observe.services.dto.constants.ReferenceStatus</enum> <enum>fr.ird.observe.services.dto.constants.TripMapPointType</enum> @@ -426,7 +426,11 @@ <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> - </enums> + </enumsWithLabel> + <enumsWithLabelAndDescription> + <enum>fr.ird.observe.application.swing.configuration.constants.CreationMode</enum> + <enum>fr.ird.observe.application.swing.configuration.constants.DbMode</enum> + </enumsWithLabelAndDescription> </configuration> </execution> <execution> @@ -458,6 +462,11 @@ <artifactId>services-api</artifactId> <version>${project.version}</version> </dependency> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>application-swing-configuration</artifactId> + <version>${project.version}</version> + </dependency> </dependencies> </plugin> diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/ChooseDbModeUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/ChooseDbModeUI.jaxx index 8b938a6..a1730e0 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/ChooseDbModeUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/ChooseDbModeUI.jaxx @@ -28,6 +28,7 @@ <import> fr.ird.observe.application.swing.ObserveSwingApplicationContext fr.ird.observe.application.swing.configuration.ObserveSwingApplicationConfig + fr.ird.observe.application.swing.I18nEnumHelper fr.ird.observe.application.swing.ui.UIHelper fr.ird.observe.application.swing.ui.storage.StorageStep fr.ird.observe.application.swing.configuration.constants.DbMode diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/ChooseDbModeUI.jcss b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/ChooseDbModeUI.jcss index 2d4ff4d..2920282 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/ChooseDbModeUI.jcss +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/ChooseDbModeUI.jcss @@ -34,28 +34,28 @@ #useLocalMode { value:{DbMode.USE_LOCAL}; - text:{DbMode.USE_LOCAL.getLabel()}; + text:{I18nEnumHelper.getLabel(DbMode.USE_LOCAL)}; enabled:{model.isCanUseLocalService()}; selected:{model.getDbMode() == DbMode.USE_LOCAL}; } #createLocalMode { value:{DbMode.CREATE_LOCAL}; - text:{DbMode.CREATE_LOCAL.getLabel()}; + text:{I18nEnumHelper.getLabel(DbMode.CREATE_LOCAL)}; enabled:{model.isCanCreateLocalService()}; selected:{model.getDbMode() == DbMode.CREATE_LOCAL}; } #useRemoteMode { value:{DbMode.USE_REMOTE}; - text:{DbMode.USE_REMOTE.getLabel()}; + text:{I18nEnumHelper.getLabel(DbMode.USE_REMOTE)}; enabled:{model.isCanUseRemoteService()}; selected:{model.getDbMode() == DbMode.USE_REMOTE}; } #useServerMode { value:{DbMode.USE_SERVER}; - text:{DbMode.USE_SERVER.getLabel()}; + text:{I18nEnumHelper.getLabel(DbMode.USE_SERVER)}; enabled:{model.isCanUseServerService()}; selected:{model.getDbMode() == DbMode.USE_SERVER}; } @@ -91,7 +91,7 @@ #importExternalDumpMode { value:{CreationMode.IMPORT_EXTERNAL_DUMP}; - text:{CreationMode.IMPORT_EXTERNAL_DUMP.getLabel()}; + text:{I18nEnumHelper.getLabel(CreationMode.IMPORT_EXTERNAL_DUMP)}; selected:{model.getCreationMode() == CreationMode.IMPORT_EXTERNAL_DUMP}; } @@ -100,19 +100,19 @@ #importLocalStorageMode { visible:{getHandler().updateCreationModeLayout(ChooseDbModeUI.this, false, importLocalStorageMode)}; value:{CreationMode.IMPORT_LOCAL_STORAGE}; - text:{CreationMode.IMPORT_LOCAL_STORAGE.getLabel()}; + text:{I18nEnumHelper.getLabel(CreationMode.IMPORT_LOCAL_STORAGE)}; selected:{model.getCreationMode() == CreationMode.IMPORT_LOCAL_STORAGE}; } #importRemoteStorageMode { value:{CreationMode.IMPORT_REMOTE_STORAGE}; - text:{CreationMode.IMPORT_REMOTE_STORAGE.getLabel()}; + text:{I18nEnumHelper.getLabel(CreationMode.IMPORT_REMOTE_STORAGE)}; selected:{model.getCreationMode() == CreationMode.IMPORT_REMOTE_STORAGE}; } #importServerStorageMode { value:{CreationMode.IMPORT_SERVER_STORAGE}; - text:{CreationMode.IMPORT_SERVER_STORAGE.getLabel()}; + text:{I18nEnumHelper.getLabel(CreationMode.IMPORT_SERVER_STORAGE)}; selected:{model.getCreationMode() == CreationMode.IMPORT_SERVER_STORAGE}; } diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/ConfigReferentielUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/ConfigReferentielUI.jaxx index 91f9047..13c522e 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/ConfigReferentielUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/ConfigReferentielUI.jaxx @@ -26,6 +26,7 @@ <StorageTabUI> <import> + fr.ird.observe.application.swing.I18nEnumHelper fr.ird.observe.application.swing.configuration.constants.CreationMode fr.ird.observe.application.swing.ui.storage.StorageStep diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/ConfigReferentielUI.jcss b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/ConfigReferentielUI.jcss index 6b70d6c..145f160 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/ConfigReferentielUI.jcss +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/ConfigReferentielUI.jcss @@ -42,19 +42,19 @@ #importReferentielFromBackup { value:{CreationMode.IMPORT_EXTERNAL_DUMP}; - text:{CreationMode.IMPORT_EXTERNAL_DUMP.getLabel()}; + text:{I18nEnumHelper.getLabel(CreationMode.IMPORT_EXTERNAL_DUMP)}; selected:{model.getReferentielImportMode() == CreationMode.IMPORT_EXTERNAL_DUMP}; } #importReferentielFromRemote { value:{CreationMode.IMPORT_REMOTE_STORAGE}; - text:{CreationMode.IMPORT_REMOTE_STORAGE.getLabel()}; + text:{I18nEnumHelper.getLabel(CreationMode.IMPORT_REMOTE_STORAGE)}; selected:{model.getReferentielImportMode() == CreationMode.IMPORT_REMOTE_STORAGE}; } #importReferentielFromServer { value:{CreationMode.IMPORT_SERVER_STORAGE}; - text:{CreationMode.IMPORT_SERVER_STORAGE.getLabel()}; + text:{I18nEnumHelper.getLabel(CreationMode.IMPORT_SERVER_STORAGE)}; selected:{model.getReferentielImportMode() == CreationMode.IMPORT_SERVER_STORAGE}; } diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/StorageTabUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/StorageTabUIHandler.java index cd5b000..edf34b1 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/StorageTabUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/StorageTabUIHandler.java @@ -21,19 +21,20 @@ */ package fr.ird.observe.application.swing.ui.storage.tabs; +import fr.ird.observe.application.swing.I18nEnumHelper; import fr.ird.observe.application.swing.ObserveSwingApplicationContext; import fr.ird.observe.application.swing.ObserveTextGenerator; -import fr.ird.observe.application.swing.db.ObserveSwingDataSource; -import fr.ird.observe.application.swing.db.constants.ConnexionStatus; import fr.ird.observe.application.swing.configuration.constants.CreationMode; import fr.ird.observe.application.swing.configuration.constants.DbMode; -import fr.ird.observe.services.configuration.ObserveDataSourceInformation; +import fr.ird.observe.application.swing.db.ObserveSwingDataSource; +import fr.ird.observe.application.swing.db.constants.ConnexionStatus; import fr.ird.observe.application.swing.ui.UIHelper; import fr.ird.observe.application.swing.ui.storage.StorageStep; import fr.ird.observe.application.swing.ui.storage.StorageUILauncher; import fr.ird.observe.application.swing.ui.storage.StorageUIModel; import fr.ird.observe.application.swing.ui.tree.DataSelectionTreeSelectionModel; import fr.ird.observe.application.swing.ui.tree.ObserveTreeHelper; +import fr.ird.observe.services.configuration.ObserveDataSourceInformation; import jaxx.runtime.swing.editor.MyDefaultCellEditor; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -384,7 +385,7 @@ public class StorageTabUIHandler { } else { text = t("observe.storage.internalDump.not.exist"); } - return t(CreationMode.IMPORT_INTERNAL_DUMP.getLabel()) + text; + return I18nEnumHelper.getLabel(CreationMode.IMPORT_INTERNAL_DUMP) + text; } protected String updateCanMigrateLabel(ChooseDbModeUI ui, 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 48bf952..0be29f0 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 @@ -1719,6 +1719,26 @@ 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.configuration.constants.CreationMode.EMPTY=Generate an empty data base. +observe.enum.fr.ird.observe.application.swing.configuration.constants.CreationMode.EMPTY.description=Generate a new empty data base.\nThis database won't any any referential, so you will need to import a referential later to use it. +observe.enum.fr.ird.observe.application.swing.configuration.constants.CreationMode.IMPORT_EXTERNAL_DUMP=Load a database backup (*.sql.gz) +observe.enum.fr.ird.observe.application.swing.configuration.constants.CreationMode.IMPORT_EXTERNAL_DUMP.description=Create a new databse from \na data base backup +observe.enum.fr.ird.observe.application.swing.configuration.constants.CreationMode.IMPORT_INTERNAL_DUMP=Load embbeded local database +observe.enum.fr.ird.observe.application.swing.configuration.constants.CreationMode.IMPORT_INTERNAL_DUMP.description=Generate a new local data base and import in it the referential of the last embbeded database. +observe.enum.fr.ird.observe.application.swing.configuration.constants.CreationMode.IMPORT_LOCAL_STORAGE=Import referential from a local data base +observe.enum.fr.ird.observe.application.swing.configuration.constants.CreationMode.IMPORT_LOCAL_STORAGE.description=Generate a new local data bse and import in it the referential of another local data base. +observe.enum.fr.ird.observe.application.swing.configuration.constants.CreationMode.IMPORT_REMOTE_STORAGE=Import referential from a remote database +observe.enum.fr.ird.observe.application.swing.configuration.constants.CreationMode.IMPORT_REMOTE_STORAGE.description=Generate a new local data base and import in it the referential of a remove database. +observe.enum.fr.ird.observe.application.swing.configuration.constants.CreationMode.IMPORT_SERVER_STORAGE=Import referential from a remote server +observe.enum.fr.ird.observe.application.swing.configuration.constants.CreationMode.IMPORT_SERVER_STORAGE.description=Generate a new local data base and import in it the referential of a remove server. +observe.enum.fr.ird.observe.application.swing.configuration.constants.DbMode.CREATE_LOCAL=Create a new local database +observe.enum.fr.ird.observe.application.swing.configuration.constants.DbMode.CREATE_LOCAL.description=Create a new local database (type H2) +observe.enum.fr.ird.observe.application.swing.configuration.constants.DbMode.USE_LOCAL=Use local database +observe.enum.fr.ird.observe.application.swing.configuration.constants.DbMode.USE_LOCAL.description=Use the local database (type H2) +observe.enum.fr.ird.observe.application.swing.configuration.constants.DbMode.USE_REMOTE=Use a remote database +observe.enum.fr.ird.observe.application.swing.configuration.constants.DbMode.USE_REMOTE.description=Use a remote database (type Postgresql) +observe.enum.fr.ird.observe.application.swing.configuration.constants.DbMode.USE_SERVER=Use a remote server +observe.enum.fr.ird.observe.application.swing.configuration.constants.DbMode.USE_SERVER.description=Use a remote server (type ObserveWeb) 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 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 c0c1f93..4ab87a8 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 @@ -1719,6 +1719,26 @@ 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.configuration.constants.CreationMode.EMPTY=Generar una base vacía +observe.enum.fr.ird.observe.application.swing.configuration.constants.CreationMode.EMPTY.description=Generar una nueva base local vacía.\nEsta base no tendrá referencial y usted tendrá que importar lo posteriormente... +observe.enum.fr.ird.observe.application.swing.configuration.constants.CreationMode.IMPORT_EXTERNAL_DUMP=Cargar una copia de seguridad de la base local (*.sql.gz) +observe.enum.fr.ird.observe.application.swing.configuration.constants.CreationMode.IMPORT_EXTERNAL_DUMP.description=Crear una nueva base local a partir\nde una copia de seguridad anterior de la aplicación +observe.enum.fr.ird.observe.application.swing.configuration.constants.CreationMode.IMPORT_INTERNAL_DUMP=Cargar la base de datos incrustada +observe.enum.fr.ird.observe.application.swing.configuration.constants.CreationMode.IMPORT_INTERNAL_DUMP.description=Generar una nueva base local a partir\nde la última versión de la base incrustada. +observe.enum.fr.ird.observe.application.swing.configuration.constants.CreationMode.IMPORT_LOCAL_STORAGE=Importar el referencial de una base local +observe.enum.fr.ird.observe.application.swing.configuration.constants.CreationMode.IMPORT_LOCAL_STORAGE.description=Generar una nueva base local e importar el referencial de una otra base local. +observe.enum.fr.ird.observe.application.swing.configuration.constants.CreationMode.IMPORT_REMOTE_STORAGE=Importar el referencial de una base remota +observe.enum.fr.ird.observe.application.swing.configuration.constants.CreationMode.IMPORT_REMOTE_STORAGE.description=Generar una nueva base locale e importar el referencial e una otra base remota. +observe.enum.fr.ird.observe.application.swing.configuration.constants.CreationMode.IMPORT_SERVER_STORAGE=Importar el referencial de un servidor remoto +observe.enum.fr.ird.observe.application.swing.configuration.constants.CreationMode.IMPORT_SERVER_STORAGE.description=Generar una nueva base local e importar el referencial de un servidor remoto. +observe.enum.fr.ird.observe.application.swing.configuration.constants.DbMode.CREATE_LOCAL=Crear una base local +observe.enum.fr.ird.observe.application.swing.configuration.constants.DbMode.CREATE_LOCAL.description=Crear una base local de tipo h2 +observe.enum.fr.ird.observe.application.swing.configuration.constants.DbMode.USE_LOCAL=Utilizar une base local +observe.enum.fr.ird.observe.application.swing.configuration.constants.DbMode.USE_LOCAL.description=Utilizar una base local de tipo h2 +observe.enum.fr.ird.observe.application.swing.configuration.constants.DbMode.USE_REMOTE=Utilizar una base remota +observe.enum.fr.ird.observe.application.swing.configuration.constants.DbMode.USE_REMOTE.description=Utilizar una base remota de tipo postgres +observe.enum.fr.ird.observe.application.swing.configuration.constants.DbMode.USE_SERVER=Utilizar un servidor remoto +observe.enum.fr.ird.observe.application.swing.configuration.constants.DbMode.USE_SERVER.description=Utilizar un servidor remoto 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 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 6749446..c660fea 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 @@ -1719,6 +1719,26 @@ 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.configuration.constants.CreationMode.EMPTY=Générer une base vide +observe.enum.fr.ird.observe.application.swing.configuration.constants.CreationMode.EMPTY.description=Générer une nouvelle base locale vide.\nCette base n'aura pas de référentiel et il vous faudra ensuite faire un import de référentiel... +observe.enum.fr.ird.observe.application.swing.configuration.constants.CreationMode.IMPORT_EXTERNAL_DUMP=Charger une sauvegarde de base locale (*.sql.gz) +observe.enum.fr.ird.observe.application.swing.configuration.constants.CreationMode.IMPORT_EXTERNAL_DUMP.description=Créer une nouvelle base locale à partir\nd'une précédente sauvegarde de l'application +observe.enum.fr.ird.observe.application.swing.configuration.constants.CreationMode.IMPORT_INTERNAL_DUMP=Charger la base embarquée +observe.enum.fr.ird.observe.application.swing.configuration.constants.CreationMode.IMPORT_INTERNAL_DUMP.description=Générer une nouvelle base locale à partir\nde la dernière version de la base embarquée. +observe.enum.fr.ird.observe.application.swing.configuration.constants.CreationMode.IMPORT_LOCAL_STORAGE=Importer le référentiel d'une base locale +observe.enum.fr.ird.observe.application.swing.configuration.constants.CreationMode.IMPORT_LOCAL_STORAGE.description=Générer une nouvelle base locale et y importer le référentiel d'une autre base locale. +observe.enum.fr.ird.observe.application.swing.configuration.constants.CreationMode.IMPORT_REMOTE_STORAGE=Importer le référentiel d'une base distante +observe.enum.fr.ird.observe.application.swing.configuration.constants.CreationMode.IMPORT_REMOTE_STORAGE.description=Générer une nouvelle base locale et y importer le référentiel d'une autre base distante. +observe.enum.fr.ird.observe.application.swing.configuration.constants.CreationMode.IMPORT_SERVER_STORAGE=Importer le référentiel dun serveur distant +observe.enum.fr.ird.observe.application.swing.configuration.constants.CreationMode.IMPORT_SERVER_STORAGE.description=Générer une nouvelle base locale et y importer le référentiel d'un serveur distant. +observe.enum.fr.ird.observe.application.swing.configuration.constants.DbMode.CREATE_LOCAL=Créer une base locale +observe.enum.fr.ird.observe.application.swing.configuration.constants.DbMode.CREATE_LOCAL.description=Creer une base locale de type h2 +observe.enum.fr.ird.observe.application.swing.configuration.constants.DbMode.USE_LOCAL=Utiliser une base locale +observe.enum.fr.ird.observe.application.swing.configuration.constants.DbMode.USE_LOCAL.description=Utiliser une base locale de type h2 +observe.enum.fr.ird.observe.application.swing.configuration.constants.DbMode.USE_REMOTE=Utiliser une base distante +observe.enum.fr.ird.observe.application.swing.configuration.constants.DbMode.USE_REMOTE.description=Utiliser une base distante de type postgres +observe.enum.fr.ird.observe.application.swing.configuration.constants.DbMode.USE_SERVER=Utiliser un serveur distant +observe.enum.fr.ird.observe.application.swing.configuration.constants.DbMode.USE_SERVER.description=Utiliser un serveur distant 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 diff --git a/pom.xml b/pom.xml index 7936d21..2deec5b 100644 --- a/pom.xml +++ b/pom.xml @@ -163,7 +163,7 @@ <topiaVersion>3.1.3</topiaVersion> <jaxxVersion>2.31</jaxxVersion> - <nuitonI18nVersion>3.6</nuitonI18nVersion> + <nuitonI18nVersion>3.6.1-SNAPSHOT</nuitonI18nVersion> <nuitonValidatorVersion>3.0.1</nuitonValidatorVersion> <nuitonUtilsVersion>3.0-rc-14</nuitonUtilsVersion> <xworkVersion>2.3.29</xworkVersion> @@ -185,7 +185,7 @@ <!-- i18n configuration --> <i18n.bundles>fr_FR,en_GB,es_ES</i18n.bundles> <i18n.silent>true</i18n.silent> - <i18n.failsIfWarning>true</i18n.failsIfWarning> + <i18n.failsIfAnyKeyMissingValue>true</i18n.failsIfAnyKeyMissingValue> <i18n.checkBundle>true</i18n.checkBundle> <i18n.showEmpty>true</i18n.showEmpty> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.