Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 8d235c0b by Tony CHEMIT at 2017-07-10T14:19:28+02:00 Ajout d'un traducteur dans l'application (See #788) (use now i18n 4.0-alpha-1-SNAPSHOT) - - - - - 14 changed files: - application-swing-configuration/pom.xml - application-swing-decoration/pom.xml - application-swing-validation/pom.xml - application-swing/pom.xml - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/AddFloatingObjectReferenceUIAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/EditFloatingObjectReferenceUIAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/RemoveFloatingObjectReferenceUIAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/config/TranslateAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/dcprefs/FloatingObjectReferencesUI.jaxx - application-web-configuration/pom.xml - pom.xml - services-topia/pom.xml - services-validation/pom.xml - services/pom.xml Changes: ===================================== application-swing-configuration/pom.xml ===================================== --- a/application-swing-configuration/pom.xml +++ b/application-swing-configuration/pom.xml @@ -84,7 +84,7 @@ </dependency> <dependency> <groupId>io.ultreia.java4all.i18n</groupId> - <artifactId>nuiton-i18n</artifactId> + <artifactId>i18n-api</artifactId> </dependency> <dependency> <groupId>org.nuiton</groupId> ===================================== application-swing-decoration/pom.xml ===================================== --- a/application-swing-decoration/pom.xml +++ b/application-swing-decoration/pom.xml @@ -71,7 +71,7 @@ <dependency> <groupId>io.ultreia.java4all.i18n</groupId> - <artifactId>nuiton-i18n</artifactId> + <artifactId>i18n-api</artifactId> </dependency> <dependency> <groupId>org.nuiton</groupId> ===================================== application-swing-validation/pom.xml ===================================== --- a/application-swing-validation/pom.xml +++ b/application-swing-validation/pom.xml @@ -66,7 +66,7 @@ <!-- Nuiton --> <dependency> <groupId>io.ultreia.java4all.i18n</groupId> - <artifactId>nuiton-i18n</artifactId> + <artifactId>i18n-api</artifactId> </dependency> <dependency> <groupId>org.nuiton</groupId> ===================================== application-swing/pom.xml ===================================== --- a/application-swing/pom.xml +++ b/application-swing/pom.xml @@ -461,7 +461,7 @@ </dependency> <dependency> <groupId>io.ultreia.java4all.i18n</groupId> - <artifactId>nuiton-i18n</artifactId> + <artifactId>i18n-api</artifactId> </dependency> <dependency> <groupId>io.ultreia.java4all.i18n</groupId> @@ -713,14 +713,14 @@ <configuration> <templateExtension>ftl</templateExtension> <templateList> - <template>ftl/about</template> - <template>ftl/connexionTestResult</template> - <template>ftl/dataSourceConnectionReport</template> - <template>ftl/dataSourceInformation</template> - <template>ftl/dataSourcePolicy</template> - <template>ftl/dataSourceSelectModeResume</template> - <template>ftl/initStorage</template> - <template>ftl/storageModelDataSourceConfiguration</template> + <template>about</template> + <template>connexionTestResult</template> + <template>dataSourceConnectionReport</template> + <template>dataSourceInformation</template> + <template>dataSourcePolicy</template> + <template>dataSourceSelectModeResume</template> + <template>initStorage</template> + <template>storageModelDataSourceConfiguration</template> </templateList> </configuration> </execution> ===================================== application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/AddFloatingObjectReferenceUIAction.java ===================================== --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/AddFloatingObjectReferenceUIAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/AddFloatingObjectReferenceUIAction.java @@ -89,4 +89,4 @@ public class AddFloatingObjectReferenceUIAction extends AbstractContentUIAction u.getModel().setReference(reference); } -} \ No newline at end of file +} ===================================== application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/EditFloatingObjectReferenceUIAction.java ===================================== --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/EditFloatingObjectReferenceUIAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/EditFloatingObjectReferenceUIAction.java @@ -79,4 +79,4 @@ public class EditFloatingObjectReferenceUIAction extends AbstractContentUIAction floatingObjectReferencesManager.update(reference); u.getModel().setReference(reference); } -} \ No newline at end of file +} ===================================== application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/RemoveFloatingObjectReferenceUIAction.java ===================================== --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/RemoveFloatingObjectReferenceUIAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/RemoveFloatingObjectReferenceUIAction.java @@ -73,4 +73,4 @@ public class RemoveFloatingObjectReferenceUIAction extends AbstractContentUIActi } }); } -} \ No newline at end of file +} ===================================== application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/config/TranslateAction.java ===================================== --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/config/TranslateAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/config/TranslateAction.java @@ -1,5 +1,27 @@ package fr.ird.observe.application.swing.ui.actions.menu.config; +/*- + * #%L + * ObServe :: Application Swing + * %% + * Copyright (C) 2008 - 2017 IRD, Code Lutin, Ultreia.io + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import fr.ird.observe.application.swing.ObserveSwingTechnicalException; import fr.ird.observe.application.swing.ui.ObserveMainUI; import fr.ird.observe.application.swing.ui.actions.AbstractUIAction; @@ -42,9 +64,8 @@ public class TranslateAction extends AbstractUIAction { Objects.requireNonNull(bundles); try { ProjectUI projectUI = new ProjectUI(getMainUI(), new Project(bundles)); - projectUI.getTemplatesFilter().doClick(); - projectUI.getTranslationsFilter().doClick(); - } catch (InterruptedException | IOException e) { + projectUI.toggleFilter(); + } catch (IOException e) { throw new ObserveSwingTechnicalException("can't open i18n editor", e); } } ===================================== application-swing/src/main/java/fr/ird/observe/application/swing/ui/dcprefs/FloatingObjectReferencesUI.jaxx ===================================== --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/dcprefs/FloatingObjectReferencesUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/dcprefs/FloatingObjectReferencesUI.jaxx @@ -8,12 +8,10 @@ it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/gpl-3.0.html>. ===================================== application-web-configuration/pom.xml ===================================== --- a/application-web-configuration/pom.xml +++ b/application-web-configuration/pom.xml @@ -80,7 +80,7 @@ </dependency> <dependency> <groupId>io.ultreia.java4all.i18n</groupId> - <artifactId>nuiton-i18n</artifactId> + <artifactId>i18n-api</artifactId> </dependency> <dependency> <groupId>org.nuiton</groupId> ===================================== pom.xml ===================================== --- a/pom.xml +++ b/pom.xml @@ -176,7 +176,7 @@ <licensePluginVersion>1.9</licensePluginVersion> <jaxxVersion>3.0-alpha-6</jaxxVersion> - <nuitonI18nVersion>3.7-SNAPSHOT</nuitonI18nVersion> + <nuitonI18nVersion>4.0-alpha-1-SNAPSHOT</nuitonI18nVersion> <nuitonConfigVersion>3.2</nuitonConfigVersion> <topiaVersion>3.2.1</topiaVersion> <nuitonValidatorVersion>3.1</nuitonValidatorVersion> @@ -310,6 +310,10 @@ <groupId>org.apache.commons</groupId> <artifactId>commons-vfs2</artifactId> </exclusion> + <exclusion> + <groupId>org.nuiton.i18n</groupId> + <artifactId>nuiton-i18n</artifactId> + </exclusion> </exclusions> </dependency> <dependency> @@ -349,6 +353,10 @@ <scope>compile</scope> <exclusions> <exclusion> + <groupId>org.nuiton.i18n</groupId> + <artifactId>nuiton-i18n</artifactId> + </exclusion> + <exclusion> <groupId>javassist</groupId> <artifactId>javassist</artifactId> </exclusion> @@ -373,7 +381,7 @@ </dependency> <dependency> <groupId>io.ultreia.java4all.i18n</groupId> - <artifactId>nuiton-i18n</artifactId> + <artifactId>i18n-api</artifactId> <version>${nuitonI18nVersion}</version> <scope>compile</scope> </dependency> @@ -390,6 +398,12 @@ <artifactId>jaxx-runtime</artifactId> <version>${jaxxVersion}</version> <scope>compile</scope> + <exclusions> + <exclusion> + <groupId>org.nuiton.i18n</groupId> + <artifactId>nuiton-i18n</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.nuiton.jaxx</groupId> @@ -408,71 +422,143 @@ <artifactId>jaxx-runtime-swing-wizard</artifactId> <version>${jaxxVersion}</version> <scope>compile</scope> + <exclusions> + <exclusion> + <groupId>org.nuiton.i18n</groupId> + <artifactId>nuiton-i18n</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.nuiton.jaxx</groupId> <artifactId>jaxx-validator</artifactId> <version>${jaxxVersion}</version> <scope>compile</scope> + <exclusions> + <exclusion> + <groupId>org.nuiton.i18n</groupId> + <artifactId>nuiton-i18n</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.nuiton.jaxx</groupId> <artifactId>jaxx-widgets-error</artifactId> <version>${jaxxVersion}</version> <scope>compile</scope> + <exclusions> + <exclusion> + <groupId>org.nuiton.i18n</groupId> + <artifactId>nuiton-i18n</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.nuiton.jaxx</groupId> <artifactId>jaxx-widgets-hidor</artifactId> <version>${jaxxVersion}</version> <scope>compile</scope> + <exclusions> + <exclusion> + <groupId>org.nuiton.i18n</groupId> + <artifactId>nuiton-i18n</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.nuiton.jaxx</groupId> <artifactId>jaxx-widgets-gis</artifactId> <version>${jaxxVersion}</version> <scope>compile</scope> + <exclusions> + <exclusion> + <groupId>org.nuiton.i18n</groupId> + <artifactId>nuiton-i18n</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.nuiton.jaxx</groupId> <artifactId>jaxx-widgets-datetime</artifactId> <version>${jaxxVersion}</version> <scope>compile</scope> + <exclusions> + <exclusion> + <groupId>org.nuiton.i18n</groupId> + <artifactId>nuiton-i18n</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.nuiton.jaxx</groupId> <artifactId>jaxx-widgets-select</artifactId> <version>${jaxxVersion}</version> <scope>compile</scope> + <exclusions> + <exclusion> + <groupId>org.nuiton.i18n</groupId> + <artifactId>nuiton-i18n</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.nuiton.jaxx</groupId> <artifactId>jaxx-widgets-about</artifactId> <version>${jaxxVersion}</version> <scope>compile</scope> + <exclusions> + <exclusion> + <groupId>org.nuiton.i18n</groupId> + <artifactId>nuiton-i18n</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.nuiton.jaxx</groupId> <artifactId>jaxx-widgets-number</artifactId> <version>${jaxxVersion}</version> <scope>compile</scope> + <exclusions> + <exclusion> + <groupId>org.nuiton.i18n</groupId> + <artifactId>nuiton-i18n</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.nuiton.jaxx</groupId> <artifactId>jaxx-widgets-file</artifactId> <version>${jaxxVersion}</version> <scope>compile</scope> + <exclusions> + <exclusion> + <groupId>org.nuiton.i18n</groupId> + <artifactId>nuiton-i18n</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.nuiton.jaxx</groupId> <artifactId>jaxx-widgets-status</artifactId> <version>${jaxxVersion}</version> + <exclusions> + <exclusion> + <groupId>org.nuiton.i18n</groupId> + <artifactId>nuiton-i18n</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.nuiton.jaxx</groupId> <artifactId>jaxx-widgets-config</artifactId> <version>${jaxxVersion}</version> <scope>compile</scope> + <exclusions> + <exclusion> + <groupId>org.nuiton.i18n</groupId> + <artifactId>nuiton-i18n</artifactId> + </exclusion> + </exclusions> </dependency> <!--swingX --> ===================================== services-topia/pom.xml ===================================== --- a/services-topia/pom.xml +++ b/services-topia/pom.xml @@ -106,7 +106,7 @@ </dependency> <dependency> <groupId>io.ultreia.java4all.i18n</groupId> - <artifactId>nuiton-i18n</artifactId> + <artifactId>i18n-api</artifactId> </dependency> <dependency> <groupId>org.nuiton</groupId> ===================================== services-validation/pom.xml ===================================== --- a/services-validation/pom.xml +++ b/services-validation/pom.xml @@ -79,7 +79,7 @@ </dependency> <dependency> <groupId>io.ultreia.java4all.i18n</groupId> - <artifactId>nuiton-i18n</artifactId> + <artifactId>i18n-api</artifactId> </dependency> <dependency> <groupId>org.nuiton.topia</groupId> @@ -152,6 +152,11 @@ <artifactId>persistence</artifactId> <version>${project.version}</version> </dependency> + <dependency> + <groupId>io.ultreia.java4all.i18n</groupId> + <artifactId>i18n-api</artifactId> + <version>${nuitonI18nVersion}</version> + </dependency> </dependencies> </plugin> ===================================== services/pom.xml ===================================== --- a/services/pom.xml +++ b/services/pom.xml @@ -59,7 +59,7 @@ </dependency> <dependency> <groupId>io.ultreia.java4all.i18n</groupId> - <artifactId>nuiton-i18n</artifactId> + <artifactId>i18n-api</artifactId> </dependency> <!-- commons dependencies --> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/8d235c0be810d5db2ad7663a4a4c... --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/8d235c0be810d5db2ad7663a4a4c... You're receiving this email because of your account on gitlab.com.
participants (1)
-
Tony CHEMIT