branch feature/28 created (now b52b940)
This is an automated email from the git hooks/post-receive script. New change to branch feature/28 in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git at b52b940 Utilisation de templates pour le A propos + correction lien manquants (Closes #28) This branch includes the following new commits: new b52b940 Utilisation de templates pour le A propos + correction lien manquants (Closes #28) 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 b52b940da6cbb9fc7bc741758a161d3ca6d0313d Author: Tony CHEMIT <dev@tchemit.fr> Date: Sun Jan 1 15:28:50 2017 +0100 Utilisation de templates pour le A propos + correction lien manquants (Closes #28) -- 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 feature/28 in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit b52b940da6cbb9fc7bc741758a161d3ca6d0313d Author: Tony CHEMIT <dev@tchemit.fr> Date: Sun Jan 1 15:28:50 2017 +0100 Utilisation de templates pour le A propos + correction lien manquants (Closes #28) --- .../src/main/config/ObserveSwingApplication.ini | 21 ++++++++ .../ObserveSwingApplicationConfig.java | 14 ++++++ ...pplication-swing-configuration_en_GB.properties | 3 ++ ...pplication-swing-configuration_es_ES.properties | 3 ++ ...pplication-swing-configuration_fr_FR.properties | 3 ++ application-swing/pom.xml | 24 ++++++++-- .../application/swing/ObserveTextGenerator.java | 21 ++++++++ .../ui/actions/menu/help/ShowAboutAction.java | 19 ++++---- .../src/main/resources/ftl/about_en.ftl | 56 ++++++++++++++++++++++ .../src/main/resources/ftl/about_es.ftl | 56 ++++++++++++++++++++++ .../src/main/resources/ftl/about_fr.ftl | 56 ++++++++++++++++++++++ .../src/main/resources/ftl/translate_en.ftl | 47 ++++++++++++++++++ .../src/main/resources/ftl/translate_es.ftl | 47 ++++++++++++++++++ .../src/main/resources/ftl/translate_fr.ftl | 47 ++++++++++++++++++ .../i18n/application-swing_en_GB.properties | 2 - .../i18n/application-swing_es_ES.properties | 2 - .../i18n/application-swing_fr_FR.properties | 2 - pom.xml | 2 +- 18 files changed, 404 insertions(+), 21 deletions(-) diff --git a/application-swing-configuration/src/main/config/ObserveSwingApplication.ini b/application-swing-configuration/src/main/config/ObserveSwingApplication.ini index e2ece4b..8c9ea5a 100644 --- a/application-swing-configuration/src/main/config/ObserveSwingApplication.ini +++ b/application-swing-configuration/src/main/config/ObserveSwingApplication.ini @@ -23,6 +23,27 @@ type = version transient = true final = true +[option buildVersion] +description = observe.config.build.version +key = observe.build.version +type = version +transient = true +final = true + +[option buildDate] +description = observe.config.build.date +key = observe.build.date +type = date +transient = true +final = true + +[option buildNumber] +description = observe.config.build.number +key = observe.build.number +type = string +transient = true +final = true + [option dataDirectory] description = observe.config.defaultDataDirectory.description key = data.directory diff --git a/application-swing-configuration/src/main/java/fr/ird/observe/application/swing/configuration/ObserveSwingApplicationConfig.java b/application-swing-configuration/src/main/java/fr/ird/observe/application/swing/configuration/ObserveSwingApplicationConfig.java index ccf74f4..f9ae56d 100644 --- a/application-swing-configuration/src/main/java/fr/ird/observe/application/swing/configuration/ObserveSwingApplicationConfig.java +++ b/application-swing-configuration/src/main/java/fr/ird/observe/application/swing/configuration/ObserveSwingApplicationConfig.java @@ -41,6 +41,8 @@ import org.nuiton.version.Versions; import java.beans.PropertyChangeListener; import java.io.File; import java.nio.charset.StandardCharsets; +import java.text.ParseException; +import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Arrays; import java.util.Calendar; @@ -455,6 +457,18 @@ public class ObserveSwingApplicationConfig extends GeneratedObserveSwingApplicat get().setOption(ObserveSwingApplicationConfigOption.SERVER_DATA_SOURCE_CONFIGURATIONS.getKey(), option); } + private final SimpleDateFormat dateFormat = new SimpleDateFormat(); + + @Override + public Date getBuildDate() { + String dateStr = get().getOption(ObserveSwingApplicationConfigOption.BUILD_DATE.getKey()); + try { + return dateFormat.parse(dateStr); + } catch (ParseException e) { + throw new RuntimeException(e); + } + } + ////////////////////////////////////////////////// // Toutes les étapes d'actions ////////////////////////////////////////////////// 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 3c22c6e..cddffd1 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 @@ -11,6 +11,9 @@ observe.action.commandline.use.jmx=Add JMX support observe.config.backup.atClose=Perform a backup of local source when closing application observe.config.backup.delay=Delay in minutes between local data source backup observe.config.backup.use=To activate auto backup of local source +observe.config.build.date=Build date +observe.config.build.number=Build number +observe.config.build.version=Build version observe.config.configFileName.description=Configuration filename observe.config.coordinate.format=Position format (DMD, DD, DMS) observe.config.db.locale=Language of data source 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 0d155f3..c1d0772 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 @@ -11,6 +11,9 @@ observe.action.commandline.use.jmx=Mostrar el soporte JMX observe.config.backup.atClose=Effectuer une sauvegarde de la base locale à la fermeture de l'application \#TODO observe.config.backup.delay=Delay in minutes between local data source backup \#TODO observe.config.backup.use=To activate auto backup of local source \#TODO +observe.config.build.date=Build date \#TODO +observe.config.build.number=Build number \#TODO +observe.config.build.version=Build version \#TODO observe.config.configFileName.description=Nombre del archivo de configuración observe.config.coordinate.format=Position format (DMD, DD, DMS) \#TODO observe.config.db.locale=Idioma del referencial 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 8007a51..87ae8f3 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 @@ -11,6 +11,9 @@ observe.action.commandline.use.jmx=Ajouter le support JMX observe.config.backup.atClose=Effectuer une sauvegarde de la base locale à la fermeture de l'application observe.config.backup.delay=Temps en minutes entre chaque sauvegarde de la base locale observe.config.backup.use=Pour activer la sauvegarde automatique +observe.config.build.date=Date de version +observe.config.build.number=Numéro de build +observe.config.build.version=Numéro de version observe.config.configFileName.description=Le nom du fichier de configuration observe.config.coordinate.format=Format des positions (DMD, DD, DMS) observe.config.db.locale=La langue du référentiel diff --git a/application-swing/pom.xml b/application-swing/pom.xml index ece44e7..0d1119c 100644 --- a/application-swing/pom.xml +++ b/application-swing/pom.xml @@ -656,6 +656,24 @@ </plugins> </pluginManagement> <plugins> + + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>buildnumber-maven-plugin</artifactId> + <executions> + <execution> + <goals> + <goal>create</goal> + </goals> + <phase>validate</phase> + </execution> + </executions> + <configuration> + <doCheck>false</doCheck> + <doUpdate>false</doUpdate> + </configuration> + </plugin> + <plugin> <artifactId>maven-shade-plugin</artifactId> <executions> @@ -680,7 +698,9 @@ <transformer implementation="org.apache.maven.plugins.shade.resource.XmlAppendingTransformer"> <resource>xwork.xml</resource> </transformer> - + <transformer implementation="org.apache.maven.plugins.shade.resource.DontIncludeResourceTransformer"> + <resource>CHANGELOG.txt</resource> + </transformer> <transformer implementation="org.apache.maven.plugins.shade.resource.DontIncludeResourceTransformer"> <resource>LICENSE.txt</resource> </transformer> @@ -727,8 +747,6 @@ <resource>NOTICE.txt</resource> </transformer> <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" /> - <!--<templates implementation="org.apache.maven.plugins.shade.resource.ComponentsXmlResourceTransformer" />--> - <!--<templates implementation="org.apache.maven.plugins.shade.resource.PluginXmlResourceTransformer" />--> <transformer implementation="org.apache.maven.plugins.shade.resource.IncludeResourceTransformer"> <file>README.md</file> diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ObserveTextGenerator.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ObserveTextGenerator.java index 433ab34..87afd01 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ObserveTextGenerator.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ObserveTextGenerator.java @@ -22,6 +22,7 @@ package fr.ird.observe.application.swing; * #L% */ +import com.google.common.collect.ImmutableMap; import fr.ird.observe.application.swing.configuration.ObserveSwingApplicationConfig; import fr.ird.observe.application.swing.db.ObserveSwingDataSource; import fr.ird.observe.application.swing.ui.storage.StorageUIModel; @@ -30,8 +31,11 @@ import freemarker.cache.ClassTemplateLoader; import freemarker.template.Configuration; import freemarker.template.Template; +import java.io.File; import java.io.StringWriter; import java.io.Writer; +import java.net.MalformedURLException; +import java.net.URL; import java.util.Locale; import static org.nuiton.i18n.I18n.t; @@ -51,6 +55,10 @@ public class ObserveTextGenerator { protected static final String DATA_SOURCE_POLICY_TEMPLATE = "dataSourcePolicy.ftl"; + protected static final String ABOUT_TEMPLATE = "about.ftl"; + + protected static final String TRANSLATE_TEMPLATE = "translate.ftl"; + protected final Configuration freemarkerConfiguration; @@ -94,6 +102,19 @@ public class ObserveTextGenerator { return generateHtml(observeConfiguration.getLocale(), templateName, model); } + public String getAbout(ObserveSwingApplicationConfig model) { + return generateHtml(ABOUT_TEMPLATE, model); + } + + public String getTranslate(File model) { + try { + URL url = model.toURI().toURL(); + return generateHtml(TRANSLATE_TEMPLATE, ImmutableMap.of("file", url)); + } catch (MalformedURLException e) { + throw new ObserveSwingTechnicalException(e); + } + } + protected String generateHtml(Locale locale, String templateName, Object model) { try { diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/help/ShowAboutAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/help/ShowAboutAction.java index f7dbe7f..bddc050 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/help/ShowAboutAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/help/ShowAboutAction.java @@ -23,7 +23,8 @@ package fr.ird.observe.application.swing.ui.actions.menu.help; */ import fr.ird.observe.application.swing.ObserveRunner; -import fr.ird.observe.application.swing.ObserveSwingTechnicalException; +import fr.ird.observe.application.swing.ObserveSwingApplicationContext; +import fr.ird.observe.application.swing.ObserveTextGenerator; import fr.ird.observe.application.swing.ui.ObserveMainUI; import fr.ird.observe.application.swing.ui.actions.AbstractUIAction; import org.nuiton.jaxx.widgets.about.AboutUI; @@ -36,7 +37,6 @@ import java.awt.BorderLayout; import java.awt.event.ActionEvent; import java.awt.event.KeyEvent; import java.io.File; -import java.net.MalformedURLException; import static org.nuiton.i18n.I18n.t; @@ -64,24 +64,21 @@ public class ShowAboutAction extends AbstractUIAction { ObserveMainUI ui = getMainUI(); File csvFile = new File(ui.getConfig().getI18nDirectory(), "observe-i18n.csv"); - String translateText; - try { - translateText = t("observe.about.translate.content", csvFile.toURI().toURL()); - } catch (MalformedURLException e) { - throw new ObserveSwingTechnicalException("Could not obtain url from " + csvFile, e); - } - String name = ObserveRunner.getRunner().getRunnerName(); + ObserveTextGenerator textGenerator = ObserveSwingApplicationContext.get().getTextGenerator(); + String aboutContent = textGenerator.getAbout(ui.getConfig()); + String translateContent = textGenerator.getTranslate(csvFile); + AboutUI about = AboutUIBuilder.builder(ui) .setIconPath("/icons/logo.png") .setTitle(t("observe.title.about")) .setBottomText(ui.getConfig().getCopyrightText()) - .addAboutTab(t("observe.about.message"), true) + .addAboutTab(aboutContent, true) .addDefaultLicenseTab(name, false) .addDefaultThirdPartyTab(name, false) .addDefaultChangelogTab(name, false) - .addTab(t("observe.about.translate.title"), translateText, true) + .addTab(t("observe.about.translate.title"), translateContent, true) .build(); // tweak top panel diff --git a/application-swing/src/main/resources/ftl/about_en.ftl b/application-swing/src/main/resources/ftl/about_en.ftl new file mode 100644 index 0000000..ece5e46 --- /dev/null +++ b/application-swing/src/main/resources/ftl/about_en.ftl @@ -0,0 +1,56 @@ +<#-- + #%L + ObServe :: Application Swing + %% + Copyright (C) 2008 - 2016 IRD, Code Lutin, Tony Chemit + %% + 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% +--> +<html> +<body> +<h3>ObServe</h3> +<a href="http://www.ird.fr/informatique-scientifique/projets/observe/">Système d'Information, + d'Observation et de Suivi des pêches thonières tropicales de surface.</a> +<hr/> +<p> + Application de saisie des données observateurs et de consultation de telles données depuis une base <i>Obstuna</i>. +</p> +<p> + Ce projet a été initiée en 2008 par l'unité US 007-OSIRIS de <a href="http://www.ird.fr">l'IRD</a> dans le cadre + d'un + <a href="http://www.ird.fr/informatique-scientifique/soutien/spirales/anciens_projets/affiche_projet.php?code=2008.11">project + spirale</a>.</p> +<p> + Il a été réalisé par la société <a href="http://codelutin.com">Code Lutin</a> en 2009. +</p> +<br/> +<hr/> +<p> + Pour plus d'informations, vous pouvez visiter le <a href="http://observe.codelutin.com">site du projet</a>. +</p> + +<h4>Version du locigiel</h4> +<dl> + <dt>Version</dt> + <dd>${buildVersion}</dd> + <dt>Date</dt> + <dd>${buildDate?string('dd.MM.yyyy HH:mm:ss')}</dd> + <dt>Numéro de build</dt> + <dd><a href="https://gitlab.nuiton.org/codelutin/observe/commit/${buildNumber}">${buildNumber}</a></dd> +</dl> + +</body> +</html> diff --git a/application-swing/src/main/resources/ftl/about_es.ftl b/application-swing/src/main/resources/ftl/about_es.ftl new file mode 100644 index 0000000..ece5e46 --- /dev/null +++ b/application-swing/src/main/resources/ftl/about_es.ftl @@ -0,0 +1,56 @@ +<#-- + #%L + ObServe :: Application Swing + %% + Copyright (C) 2008 - 2016 IRD, Code Lutin, Tony Chemit + %% + 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% +--> +<html> +<body> +<h3>ObServe</h3> +<a href="http://www.ird.fr/informatique-scientifique/projets/observe/">Système d'Information, + d'Observation et de Suivi des pêches thonières tropicales de surface.</a> +<hr/> +<p> + Application de saisie des données observateurs et de consultation de telles données depuis une base <i>Obstuna</i>. +</p> +<p> + Ce projet a été initiée en 2008 par l'unité US 007-OSIRIS de <a href="http://www.ird.fr">l'IRD</a> dans le cadre + d'un + <a href="http://www.ird.fr/informatique-scientifique/soutien/spirales/anciens_projets/affiche_projet.php?code=2008.11">project + spirale</a>.</p> +<p> + Il a été réalisé par la société <a href="http://codelutin.com">Code Lutin</a> en 2009. +</p> +<br/> +<hr/> +<p> + Pour plus d'informations, vous pouvez visiter le <a href="http://observe.codelutin.com">site du projet</a>. +</p> + +<h4>Version du locigiel</h4> +<dl> + <dt>Version</dt> + <dd>${buildVersion}</dd> + <dt>Date</dt> + <dd>${buildDate?string('dd.MM.yyyy HH:mm:ss')}</dd> + <dt>Numéro de build</dt> + <dd><a href="https://gitlab.nuiton.org/codelutin/observe/commit/${buildNumber}">${buildNumber}</a></dd> +</dl> + +</body> +</html> diff --git a/application-swing/src/main/resources/ftl/about_fr.ftl b/application-swing/src/main/resources/ftl/about_fr.ftl new file mode 100644 index 0000000..ece5e46 --- /dev/null +++ b/application-swing/src/main/resources/ftl/about_fr.ftl @@ -0,0 +1,56 @@ +<#-- + #%L + ObServe :: Application Swing + %% + Copyright (C) 2008 - 2016 IRD, Code Lutin, Tony Chemit + %% + 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% +--> +<html> +<body> +<h3>ObServe</h3> +<a href="http://www.ird.fr/informatique-scientifique/projets/observe/">Système d'Information, + d'Observation et de Suivi des pêches thonières tropicales de surface.</a> +<hr/> +<p> + Application de saisie des données observateurs et de consultation de telles données depuis une base <i>Obstuna</i>. +</p> +<p> + Ce projet a été initiée en 2008 par l'unité US 007-OSIRIS de <a href="http://www.ird.fr">l'IRD</a> dans le cadre + d'un + <a href="http://www.ird.fr/informatique-scientifique/soutien/spirales/anciens_projets/affiche_projet.php?code=2008.11">project + spirale</a>.</p> +<p> + Il a été réalisé par la société <a href="http://codelutin.com">Code Lutin</a> en 2009. +</p> +<br/> +<hr/> +<p> + Pour plus d'informations, vous pouvez visiter le <a href="http://observe.codelutin.com">site du projet</a>. +</p> + +<h4>Version du locigiel</h4> +<dl> + <dt>Version</dt> + <dd>${buildVersion}</dd> + <dt>Date</dt> + <dd>${buildDate?string('dd.MM.yyyy HH:mm:ss')}</dd> + <dt>Numéro de build</dt> + <dd><a href="https://gitlab.nuiton.org/codelutin/observe/commit/${buildNumber}">${buildNumber}</a></dd> +</dl> + +</body> +</html> diff --git a/application-swing/src/main/resources/ftl/translate_en.ftl b/application-swing/src/main/resources/ftl/translate_en.ftl new file mode 100644 index 0000000..89821c7 --- /dev/null +++ b/application-swing/src/main/resources/ftl/translate_en.ftl @@ -0,0 +1,47 @@ +<#-- + #%L + ObServe :: Application Swing + %% + Copyright (C) 2008 - 2016 IRD, Code Lutin, Tony Chemit + %% + 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% +--> +<html> +<body> +<h2>Comment traduire ObServe</h2>Vous pouvez nous aider à traduire l'application. +<hr/> +<br/> +<ul> + <li>Récupérer le fichier <a href="${file}">observe-i18n.csv</a> dans le répertoire <strong>i18n</strong></li> + <li>ouvrez le avec un tableur avec les options suivantes : + <dl> + <dt>caractère séparateur</dt> + <dd><strong><i>|</i></strong></dd> + <dt>encoding</dt> + <dd><strong><i>UTF-8</i></strong></dd> + <dt>texte encapsulé par des</dt> + <dd><strong><i>"</i></strong></dd> + </dl> + </li> + <li>Traduisez, Améliorer, ...</li> + <li>Enfin renvoyez-le nous</li> +</ul> +<br/> +<p> + Vos modifications seront prises en compte avant la prochaine version. +</p> +</body> +</html> diff --git a/application-swing/src/main/resources/ftl/translate_es.ftl b/application-swing/src/main/resources/ftl/translate_es.ftl new file mode 100644 index 0000000..89821c7 --- /dev/null +++ b/application-swing/src/main/resources/ftl/translate_es.ftl @@ -0,0 +1,47 @@ +<#-- + #%L + ObServe :: Application Swing + %% + Copyright (C) 2008 - 2016 IRD, Code Lutin, Tony Chemit + %% + 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% +--> +<html> +<body> +<h2>Comment traduire ObServe</h2>Vous pouvez nous aider à traduire l'application. +<hr/> +<br/> +<ul> + <li>Récupérer le fichier <a href="${file}">observe-i18n.csv</a> dans le répertoire <strong>i18n</strong></li> + <li>ouvrez le avec un tableur avec les options suivantes : + <dl> + <dt>caractère séparateur</dt> + <dd><strong><i>|</i></strong></dd> + <dt>encoding</dt> + <dd><strong><i>UTF-8</i></strong></dd> + <dt>texte encapsulé par des</dt> + <dd><strong><i>"</i></strong></dd> + </dl> + </li> + <li>Traduisez, Améliorer, ...</li> + <li>Enfin renvoyez-le nous</li> +</ul> +<br/> +<p> + Vos modifications seront prises en compte avant la prochaine version. +</p> +</body> +</html> diff --git a/application-swing/src/main/resources/ftl/translate_fr.ftl b/application-swing/src/main/resources/ftl/translate_fr.ftl new file mode 100644 index 0000000..89821c7 --- /dev/null +++ b/application-swing/src/main/resources/ftl/translate_fr.ftl @@ -0,0 +1,47 @@ +<#-- + #%L + ObServe :: Application Swing + %% + Copyright (C) 2008 - 2016 IRD, Code Lutin, Tony Chemit + %% + 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% +--> +<html> +<body> +<h2>Comment traduire ObServe</h2>Vous pouvez nous aider à traduire l'application. +<hr/> +<br/> +<ul> + <li>Récupérer le fichier <a href="${file}">observe-i18n.csv</a> dans le répertoire <strong>i18n</strong></li> + <li>ouvrez le avec un tableur avec les options suivantes : + <dl> + <dt>caractère séparateur</dt> + <dd><strong><i>|</i></strong></dd> + <dt>encoding</dt> + <dd><strong><i>UTF-8</i></strong></dd> + <dt>texte encapsulé par des</dt> + <dd><strong><i>"</i></strong></dd> + </dl> + </li> + <li>Traduisez, Améliorer, ...</li> + <li>Enfin renvoyez-le nous</li> +</ul> +<br/> +<p> + Vos modifications seront prises en compte avant la prochaine version. +</p> +</body> +</html> 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 1d1617e..e12afe5 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 @@ -1,5 +1,3 @@ -observe.about.message=<h3>ObServe</h3><a href\="http\://www.ird.fr/informatique-scientifique/projets/observe/">Système d'Information, d'Observation et de Suivi des pêches thonières tropicales de surface.</a><hr/><p>Application de saisie des données observateurs et de consultation de telles données depuis une base <i>Obstuna</i>.</p> <p>Ce projet a été initiée en 2008 par l'unité US 007-OSIRIS de <a href\="http\://www.ird.fr">l'IRD</a> dans le cadre d'un <a href\="http\://www.ird.fr/infor [...] -observe.about.translate.content=<h2>Comment traduire ObServe</h2>Vous pouvez nous aider à traduire l'application.<hr/><br/><ul><li>Récupérer le fichier <a href\="%s">observe-i18n.csv</a> dans le répertoire <strong>i18n</strong></li><li>ouvrez le avec un tableur avec les options suivantes \: <ul><li>caractère séparateur \: <strong><i>|</i></strong></li><li>encoding <strong><i>UTF-8</i></strong></li><li>texte encapsulé par des <strong><i>"</i></strong></li></ul></li><li>Traduisez, Améliore [...] observe.about.translate.title=translate ObServe observe.action.about=About observe.action.about.tip=About ObServe... 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 d93c511..6606fba 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 @@ -1,5 +1,3 @@ -observe.about.message=<h3>ObServe</h3><a href\="http\://www.ird.fr/informatique-scientifique/projets/observe/">Système d'Information, d'Observation et de Suivi des pêches thonières tropicales de surface.</a><hr/><p>Aplicación de adquisición Application de datos de observadores y de consulta de estos datos desde una base <i>Obstuna</i>.</p> <p>Este projecto se ha iniciado en 2009 por la unidad US 007-OSIRIS del <a href\="http\://www.ird.fr">IRD</a> dentro del marco de <a href\="http\://ww [...] -observe.about.translate.content=<h2>Comment traduire ObServe</h2>Vous pouvez nous aider à traduire l'application.<hr/><br/><ul><li>Récupérer le fichier <a href\="%s">observe-i18n.csv</a> dans le répertoire <strong>i18n</strong></li><li>ouvrez le avec un tableur avec les options suivantes \: <ul><li>caractère séparateur \: <strong><i>|</i></strong></li><li>encoding <strong><i>UTF-8</i></strong></li><li>texte encapsulé par des <strong><i>"</i></strong></li></ul></li><li>Traduisez, Améliore [...] observe.about.translate.title=Traducir ObServe observe.action.about=A cerca de observe.action.about.tip=A cerca de ObServe... 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 267f34b..d2a05dc 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 @@ -1,5 +1,3 @@ -observe.about.message=<h3>ObServe</h3><a href\="http\://www.ird.fr/informatique-scientifique/projets/observe/">Système d'Information, d'Observation et de Suivi des pêches thonières tropicales de surface.</a><hr/><p>Application de saisie des données observateurs et de consultation de telles données depuis une base <i>Obstuna</i>.</p> <p>Ce projet a été initiée en 2008 par l'unité US 007-OSIRIS de <a href\="http\://www.ird.fr">l'IRD</a> dans le cadre d'un <a href\="http\://www.ird.fr/infor [...] -observe.about.translate.content=<h2>Comment traduire ObServe</h2>Vous pouvez nous aider à traduire l'application.<hr/><br/><ul><li>Récupérer le fichier <a href\="%s">observe-i18n.csv</a> dans le répertoire <strong>i18n</strong></li><li>ouvrez le avec un tableur avec les options suivantes \: <ul><li>caractère séparateur \: <strong><i>|</i></strong></li><li>encoding <strong><i>UTF-8</i></strong></li><li>texte encapsulé par des <strong><i>"</i></strong></li></ul></li><li>Traduisez, Améliore [...] observe.about.translate.title=Traduire ObServe observe.action.about=À propos observe.action.about.tip=À propos d'ObServe... diff --git a/pom.xml b/pom.xml index ddb9f36..d073f6b 100644 --- a/pom.xml +++ b/pom.xml @@ -160,7 +160,7 @@ <processorPluginVersion>1.3</processorPluginVersion> <topiaVersion>3.2</topiaVersion> - <jaxxVersion>3.0-alpha-2</jaxxVersion> + <jaxxVersion>3.0-SNAPSHOT</jaxxVersion> <nuitonI18nVersion>3.6.2</nuitonI18nVersion> <nuitonValidatorVersion>3.0.1</nuitonValidatorVersion> <nuitonUtilsVersion>3.0-rc-16</nuitonUtilsVersion> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm