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 04fb27a35f79577277b740379b98d82c4eaa0037 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun May 1 12:44:37 2016 +0200 Renommage côté ui de l'import concerné (See #8297) --- .../ui/actions/importData/ConfigureResultsImport.java | 12 ++++++------ .../src/main/resources/i18n/echobase-ui_en_GB.properties | 2 +- .../src/main/resources/i18n/echobase-ui_fr_FR.properties | 2 +- .../webapp/WEB-INF/jsp/importData/configureResultsImport.jsp | 4 ++-- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureResultsImport.java b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureResultsImport.java index 638407b..b02b842 100644 --- a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureResultsImport.java +++ b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureResultsImport.java @@ -230,16 +230,16 @@ public class ConfigureResultsImport extends AbstractConfigureImport<VoyageResult getModel().getEsduByEchotypeAndSpeciesCategoryFile().setFileName(fileName); } - public void setEsduBySpeciesAndSizeCategoryFile(File file) { - getModel().getEsduBySpeciesAndSizeCategoryFile().setFile(file); + public void setEsduByEchotypeAndSpeciesCategoryAndLengthFile(File file) { + getModel().getEsduByEchotypeAndSpeciesCategoryAndLengthFile().setFile(file); } - public void setEsduBySpeciesAndSizeCategoryFileContentType(String contentType) { - getModel().getEsduBySpeciesAndSizeCategoryFile().setContentType(contentType); + public void setEsduByEchotypeAndSpeciesCategoryAndLengthFileContentType(String contentType) { + getModel().getEsduByEchotypeAndSpeciesCategoryAndLengthFile().setContentType(contentType); } - public void setEsduBySpeciesAndSizeCategoryFileFileName(String fileName) { - getModel().getEsduBySpeciesAndSizeCategoryFile().setFileName(fileName); + public void setEsduByEchotypeAndSpeciesCategoryAndLengthFileFileName(String fileName) { + getModel().getEsduByEchotypeAndSpeciesCategoryAndLengthFile().setFileName(fileName); } public void setEsduBySpeciesAndAgeCategoryFile(File file) { 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 b74d569..1baf9b3 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 @@ -81,10 +81,10 @@ echobase.common.echotypeFile= echobase.common.email=E-mail echobase.common.entityId=ID echobase.common.entityType=Entity type +echobase.common.esduByEchotypeAndSpeciesCategoryAndLengthFile= echobase.common.esduByEchotypeAndSpeciesCategoryFile= echobase.common.esduByEchotypeFile= echobase.common.esduBySpeciesAndAgeCategoryFile= -echobase.common.esduBySpeciesAndSizeCategoryFile= echobase.common.exportDbMode=Mode echobase.common.extractCommunityIndicator=Extract community indicators echobase.common.extractMaps=Extract maps 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 a4cf8bf..f8fb5ee 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 @@ -81,10 +81,10 @@ echobase.common.echotypeFile= echobase.common.email=Courriel echobase.common.entityId=Identifiant de l'entité echobase.common.entityType=Type d'entité +echobase.common.esduByEchotypeAndSpeciesCategoryAndLengthFile= echobase.common.esduByEchotypeAndSpeciesCategoryFile= echobase.common.esduByEchotypeFile= echobase.common.esduBySpeciesAndAgeCategoryFile= -echobase.common.esduBySpeciesAndSizeCategoryFile= echobase.common.exportDbMode=Mode echobase.common.extractCommunityIndicator=Extraire les indicateurs de communauté echobase.common.extractMaps=Extraire les cartes diff --git a/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureResultsImport.jsp b/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureResultsImport.jsp index 64e8720..8012881 100644 --- a/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureResultsImport.jsp +++ b/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureResultsImport.jsp @@ -136,8 +136,8 @@ <s:file key="esduByEchotypeAndSpeciesCategoryFile" label='%{getText("echobase.common.esduByEchotypeAndSpeciesCategoryFile")}'/> - <s:file key="esduBySpeciesAndSizeCategoryFile" - label='%{getText("echobase.common.esduBySpeciesAndSizeCategoryFile")}'/> + <s:file key="esduByEchotypeAndSpeciesCategoryAndLengthFile" + label='%{getText("echobase.common.esduByEchotypeAndSpeciesCategoryAndLengthFile")}'/> <s:file key="esduBySpeciesAndAgeCategoryFile" label='%{getText("echobase.common.esduBySpeciesAndAgeCategoryFile")}'/> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.