This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git commit 049811283f243377bc83ef1799ae5c14b85c7748 Author: Julien Ruchaud <julien.ruchaud@debux.org> Date: Wed Oct 26 18:11:58 2016 +0200 Add translates --- .../ifremer/echobase/ui/actions/exportAtlantos/Configure.java | 11 ++--------- .../ifremer/echobase/ui/actions/exportAtlantos/Download.java | 2 ++ .../fr/ifremer/echobase/ui/actions/exportAtlantos/Export.java | 2 ++ .../src/main/resources/i18n/echobase-ui_en_GB.properties | 6 ++++++ .../src/main/resources/i18n/echobase-ui_fr_FR.properties | 6 ++++++ 5 files changed, 18 insertions(+), 9 deletions(-) diff --git a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportAtlantos/Configure.java b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportAtlantos/Configure.java index f5670cc..3700d4f 100644 --- a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportAtlantos/Configure.java +++ b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportAtlantos/Configure.java @@ -21,17 +21,9 @@ package fr.ifremer.echobase.ui.actions.exportAtlantos; * #L% */ -import fr.ifremer.echobase.ui.actions.exportCoser.*; -import fr.ifremer.echobase.EchoBaseTechnicalException; import fr.ifremer.echobase.entities.data.Voyage; -import fr.ifremer.echobase.entities.references.Mission; -import fr.ifremer.echobase.persistence.JdbcConfiguration; -import fr.ifremer.echobase.services.service.CoserApiService; import fr.ifremer.echobase.services.service.atlantos.ExportAtlantosConfiguration; import fr.ifremer.echobase.services.service.atlantos.ExportAtlantosService; -import fr.ifremer.echobase.services.service.exportCoser.ExportCoserConfiguration; -import fr.ifremer.echobase.services.service.importdata.configurations.VoyageAcousticsImportConfiguration; -import fr.ifremer.echobase.ui.EchoBaseSession; import fr.ifremer.echobase.ui.actions.AbstractConfigureAction; import org.apache.commons.io.FileUtils; import org.apache.commons.logging.Log; @@ -41,9 +33,10 @@ import org.nuiton.util.FileUtil; import javax.inject.Inject; import java.io.File; import java.io.IOException; -import java.util.Collections; import java.util.Map; +import static org.nuiton.i18n.I18n.t; + /** * Created on 3/1/14. * diff --git a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportAtlantos/Download.java b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportAtlantos/Download.java index dc10efe..3bc13ff 100644 --- a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportAtlantos/Download.java +++ b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportAtlantos/Download.java @@ -29,6 +29,8 @@ import java.io.File; import java.io.FileInputStream; import java.io.InputStream; +import static org.nuiton.i18n.I18n.t; + /** * Created on 3/1/14. * diff --git a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportAtlantos/Export.java b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportAtlantos/Export.java index 1f0a761..8aca204 100644 --- a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportAtlantos/Export.java +++ b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportAtlantos/Export.java @@ -27,6 +27,8 @@ import fr.ifremer.echobase.ui.actions.AbstractWaitAndExecAction; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import static org.nuiton.i18n.I18n.t; + /** * Created on 3/1/14. * diff --git a/echobase-ui/src/main/resources/i18n/echobase-ui_en_GB.properties b/echobase-ui/src/main/resources/i18n/echobase-ui_en_GB.properties index e5f81fb..9e63ee4 100644 --- a/echobase-ui/src/main/resources/i18n/echobase-ui_en_GB.properties +++ b/echobase-ui/src/main/resources/i18n/echobase-ui_en_GB.properties @@ -272,6 +272,8 @@ echobase.error.login.wrongLogin=Le login est déjà utilisé echobase.error.mission.name.already.exist=The mission name already exists echobase.error.no.embeddedApplication.configurationFound=Portable database configuration not found echobase.error.no.embeddedApplication.exportFileFound=New portable database not found +echobase.error.no.exportAtlantos.configurationFound=Atlantos export configuration not found +echobase.error.no.exportAtlantos.exportFileFound=Atlantos archive not found echobase.error.no.exportCoser.configurationFound=Coser export configuration not found echobase.error.no.exportCoser.exportFileFound=Coser archive not found echobase.error.no.exportDb.configurationFound=Database export configuration not found @@ -298,6 +300,8 @@ echobase.info.dbeditor.propertyDiffsResult=Data import results echobase.info.documentation=EchoBase online documentation echobase.info.downloadFiles=Download EchoBase or some import files echobase.info.echoR=EchoR project +echobase.info.exportAtlantos.failed=Atlantos export failed +echobase.info.exportAtlantos.succeded=Atlantos export successful echobase.info.exportCoser.failed=Coser export failed echobase.info.exportCoser.succeded=Coser export successful echobase.info.exportDb.archive=Basename of the archive, extension <strong>.echobase</strong> will be added to it. @@ -372,6 +376,7 @@ echobase.legend.dbeditor.edit=Editing '%s' echobase.legend.dbeditor.show=Displaying '%s' echobase.legend.embeddedApplication.configuration=Portable database configuration echobase.legend.exportAtlantos.configure=Export configuration +echobase.legend.exportAtlantos.resume=Resume of Atlantos export echobase.legend.exportCoser.configuration.files=Export configuration echobase.legend.exportCoser.resume=Resume of Coser export echobase.legend.exportDb.configuration.files=Export configuration @@ -416,6 +421,7 @@ echobase.message.createEmbedded.result=Portable application was successful in %s echobase.message.db.no.spatial.structure=The working database is not spatialized. echobase.message.db.no.spatial.support=The working database has no spatial support. echobase.message.download.link=If download did not start by itself, you can start it manually from this link\: +echobase.message.exportAtantos.result= echobase.message.exportCoser.result=Coser Export was successful (file %s) in %s. echobase.message.exportDb.result=Export of database (mode %s) was successful (file %s) in %s. echobase.message.gis.install=See the installation documentation. diff --git a/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties b/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties index d180d4e..d750ebf 100644 --- a/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties +++ b/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties @@ -273,6 +273,8 @@ echobase.error.login.wrongLogin=Le login est déjà utilisé echobase.error.mission.name.already.exist=Nom de mission déjà utilisé echobase.error.no.embeddedApplication.configurationFound=Configuration de création d'application embarquée non trouvée echobase.error.no.embeddedApplication.exportFileFound=Application embarquée générée non trouvée +echobase.error.no.exportAtlantos.configurationFound=Configuration de l'export Atlantos +echobase.error.no.exportAtlantos.exportFileFound=Archive d'export Atlantos introuvable echobase.error.no.exportCoser.configurationFound=Configuration de l'export Coser echobase.error.no.exportCoser.exportFileFound=Archive d'export Coser introuvable echobase.error.no.exportDb.configurationFound=Configuration de l'export de la base non trouvée @@ -300,6 +302,8 @@ echobase.info.delete.entity=La donnée de type '%s' a été supprimée echobase.info.documentation=Documentation en ligne d'EchoBase echobase.info.downloadFiles=Télécharger l'application ou des fichiers d'imports echobase.info.echoR=Projet EchoR +echobase.info.exportAtlantos.failed=L'export Atlantos a échoué +echobase.info.exportAtlantos.succeded=L'export Atlantos a réussi echobase.info.exportCoser.archive=Il s'agit du nom de l'archive, l'extension <strong>.zip</strong> sera automatiquement rajoutée. echobase.info.exportCoser.failed=L'export Coser a échoué echobase.info.exportCoser.succeded=L'export Coser a réussi @@ -375,6 +379,7 @@ echobase.legend.dbeditor.edit=Edition de '%s' echobase.legend.dbeditor.show=Visualisation de '%s' echobase.legend.embeddedApplication.configuration=Configuration de l'application embarquée echobase.legend.exportAtlantos.configure=Configuration de l'export +echobase.legend.exportAtlantos.resume=Résumé de l'export Atlantos echobase.legend.exportCoser.configuration.files=Configuration de l'export echobase.legend.exportCoser.resume=Résumé de l'export Coser echobase.legend.exportDb.configuration.files=Configuration de l'export @@ -419,6 +424,7 @@ echobase.message.createEmbedded.result=La création de l'application embarqué a echobase.message.db.no.spatial.structure=La base de travail que vous utilisez n'est pas spatialisée. echobase.message.db.no.spatial.support=La base de travail que vous utilisez ne possède pas de support spatiale. echobase.message.download.link=Si le téléchargement n'a pas démarré automatiquement, suivez ce lien \: +echobase.message.exportAtantos.result= echobase.message.exportCoser.result=L'export Coser a réussi (fichier %s) en %s echobase.message.exportDb.result=L'export de la base (mode %s) a réussi (fichier %s) en %s echobase.message.gis.install=Consulter la documentation d'installation. -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.