branch feature/8180 updated (150c7e6 -> d3f6fb9)
This is an automated email from the git hooks/post-receive script. New change to branch feature/8180 in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git from 150c7e6 Fix delete import for mooring new d3f6fb9 Fix delete import for mooring 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 d3f6fb97f0aa645f40ce219b15d332f272f000ab Author: Julien Ruchaud <julien.ruchaud@debux.org> Date: Tue Jun 28 16:55:04 2016 +0200 Fix delete import for mooring Summary of changes: .../java/fr/ifremer/echobase/ui/actions/removeData/ConfirmDelete.java | 2 -- echobase-ui/src/main/resources/i18n/echobase-ui_en_GB.properties | 2 +- echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties | 2 +- 3 files changed, 2 insertions(+), 4 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch feature/8180 in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git commit d3f6fb97f0aa645f40ce219b15d332f272f000ab Author: Julien Ruchaud <julien.ruchaud@debux.org> Date: Tue Jun 28 16:55:04 2016 +0200 Fix delete import for mooring --- .../java/fr/ifremer/echobase/ui/actions/removeData/ConfirmDelete.java | 2 -- echobase-ui/src/main/resources/i18n/echobase-ui_en_GB.properties | 2 +- echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties | 2 +- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/removeData/ConfirmDelete.java b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/removeData/ConfirmDelete.java index 8d75a31..62f0b26 100644 --- a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/removeData/ConfirmDelete.java +++ b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/removeData/ConfirmDelete.java @@ -25,12 +25,10 @@ import com.google.common.base.Optional; import com.google.common.collect.Lists; import fr.ifremer.echobase.entities.ImportLog; import fr.ifremer.echobase.entities.ImportType; -import fr.ifremer.echobase.entities.data.Voyage; import fr.ifremer.echobase.services.service.removedata.RemoveDataConfiguration; import fr.ifremer.echobase.ui.actions.AbstractConfigureAction; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.nuiton.decorator.Decorator; import java.io.IOException; import java.util.List; 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 5c541f6..c5e86c0 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 @@ -107,7 +107,7 @@ echobase.common.importDbFile= echobase.common.importDbMode=Import db mode echobase.common.importEntity=For echobase.common.importError=Error\: -echobase.common.importLogToDelete=Voyage %s - Import type %s - Date %s +echobase.common.importLogToDelete=%s - Import type %s - Date %s echobase.common.importNotes=Import notes echobase.common.importResult=Import results echobase.common.importText=import description 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 faea791..41158fc 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 @@ -107,7 +107,7 @@ echobase.common.importDbFile= echobase.common.importDbMode=Mode d'import echobase.common.importEntity=Lié à echobase.common.importError=Une erreur est survenue pendant l'import \: -echobase.common.importLogToDelete=Campagne %s - Type d'import %s - Date %s +echobase.common.importLogToDelete=%s - Type d'import %s - Date %s echobase.common.importNotes=Remarques sur l'import echobase.common.importResult=Résultat de l'import echobase.common.importText=Description -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm