This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository coselmar. See http://git.codelutin.com/coselmar.git commit 0e7e3b74112751c6d58c287c0400c69958c24d39 Author: Yannick Martel <martel@©odelutin.com> Date: Wed Jan 13 11:33:45 2016 +0100 Fixes #7774 Translate project status in export --- .../ifremer/coselmar/beans/QuestionExportModel.java | 21 +++++++++++++++++---- .../fr/ifremer/coselmar/beans/UserExportModel.java | 2 -- .../i18n/coselmar-services_en_GB.properties | 4 ++++ .../i18n/coselmar-services_fr_FR.properties | 4 ++++ 4 files changed, 25 insertions(+), 6 deletions(-) diff --git a/coselmar-rest/src/main/java/fr/ifremer/coselmar/beans/QuestionExportModel.java b/coselmar-rest/src/main/java/fr/ifremer/coselmar/beans/QuestionExportModel.java index 27f03a9..518027c 100644 --- a/coselmar-rest/src/main/java/fr/ifremer/coselmar/beans/QuestionExportModel.java +++ b/coselmar-rest/src/main/java/fr/ifremer/coselmar/beans/QuestionExportModel.java @@ -23,6 +23,7 @@ package fr.ifremer.coselmar.beans; */ import com.google.common.base.Joiner; +import org.apache.commons.lang.StringUtils; import org.nuiton.csv.Common; import org.nuiton.csv.ValueFormatter; import org.nuiton.csv.ext.AbstractExportModel; @@ -59,16 +60,28 @@ public class QuestionExportModel extends AbstractExportModel<QuestionBean> { } }; - protected static final Common.DateValue dateFormatter = new Common.DateValue(DateUtil.DEFAULT_PATTERN); + protected static final ValueFormatter<String> QUESTION_STATUS_FORMATTER = new ValueFormatter<String>() { + @Override + public String format(String value) { + String result = ""; + if (StringUtils.isNotBlank(value)) { + result = t("question.metadata.status." + value.toLowerCase()); + + } + return result; + } + }; + + protected static final Common.DateValue DATE_FORMATTER = new Common.DateValue(DateUtil.DEFAULT_PATTERN); public QuestionExportModel() { super(';'); modelBuilder.newColumnForExport(t("question.metadata.title"), QuestionBean.PROPERTY_TITLE); - modelBuilder.newColumnForExport(t("question.metadata.submissionDate"), QuestionBean.PROPERTY_SUBMISSION_DATE, dateFormatter); - modelBuilder.newColumnForExport(t("question.metadata.status"), QuestionBean.PROPERTY_STATUS); + modelBuilder.newColumnForExport(t("question.metadata.submissionDate"), QuestionBean.PROPERTY_SUBMISSION_DATE, DATE_FORMATTER); + modelBuilder.newColumnForExport(t("question.metadata.status"), QuestionBean.PROPERTY_STATUS, QUESTION_STATUS_FORMATTER); modelBuilder.newColumnForExport(t("question.metadata.themes"), QuestionBean.PROPERTY_THEMES, COLLECTION_STRING_FORMATTER); - modelBuilder.newColumnForExport(t("question.metadata.deadline"), QuestionBean.PROPERTY_DEADLINE, dateFormatter); + modelBuilder.newColumnForExport(t("question.metadata.deadline"), QuestionBean.PROPERTY_DEADLINE, DATE_FORMATTER); modelBuilder.newColumnForExport(t("question.metadata.participants"), QuestionBean.PROPERTY_PARTICIPANTS, COLLECTION_COUNTER_VALUE_FORMATTER); modelBuilder.newColumnForExport(t("question.metadata.clients"), QuestionBean.PROPERTY_CLIENTS, COLLECTION_COUNTER_VALUE_FORMATTER); modelBuilder.newColumnForExport(t("question.metadata.relatedDocuments"), QuestionBean.PROPERTY_RELATED_DOCUMENTS, COLLECTION_COUNTER_VALUE_FORMATTER); diff --git a/coselmar-rest/src/main/java/fr/ifremer/coselmar/beans/UserExportModel.java b/coselmar-rest/src/main/java/fr/ifremer/coselmar/beans/UserExportModel.java index 0fd91e9..8600cb4 100644 --- a/coselmar-rest/src/main/java/fr/ifremer/coselmar/beans/UserExportModel.java +++ b/coselmar-rest/src/main/java/fr/ifremer/coselmar/beans/UserExportModel.java @@ -61,8 +61,6 @@ public class UserExportModel extends AbstractExportModel<UserBean> { } }; - protected static final Common.DateValue dateFormatter = new Common.DateValue(DateUtil.DEFAULT_PATTERN); - public UserExportModel() { super(';'); diff --git a/coselmar-rest/src/main/resources/i18n/coselmar-services_en_GB.properties b/coselmar-rest/src/main/resources/i18n/coselmar-services_en_GB.properties index 49367d5..361a1cf 100644 --- a/coselmar-rest/src/main/resources/i18n/coselmar-services_en_GB.properties +++ b/coselmar-rest/src/main/resources/i18n/coselmar-services_en_GB.properties @@ -31,6 +31,10 @@ question.metadata.status=Status question.metadata.clients=Clients question.metadata.relatedDocuments=Related documents question.metadata.participants=Participants +question.metadata.status.open=Open +question.metadata.status.in_progress=In progress +question.metadata.status.closed=Closed +question.metadata.status.adjourned=Adjourned user.metadata.name=Name user.metadata.firstName=First name diff --git a/coselmar-rest/src/main/resources/i18n/coselmar-services_fr_FR.properties b/coselmar-rest/src/main/resources/i18n/coselmar-services_fr_FR.properties index 9fd8ca4..4887532 100644 --- a/coselmar-rest/src/main/resources/i18n/coselmar-services_fr_FR.properties +++ b/coselmar-rest/src/main/resources/i18n/coselmar-services_fr_FR.properties @@ -32,6 +32,10 @@ question.metadata.status=Status question.metadata.clients=Clients question.metadata.relatedDocuments=Documents associés question.metadata.participants=Participants +question.metadata.status.open=Ouverte +question.metadata.status.in_progress=En cours +question.metadata.status.closed=Fermée +question.metadata.status.adjourned=Ajournée user.metadata.name=Nom user.metadata.firstName=Prénom -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.