This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository faxtomail. See https://gitlab.nuiton.org/codelutin/faxtomail.git commit 4cb0201421ad981d17e0391ae0d71bcc95724bd7 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Tue Jun 12 18:24:05 2018 +0200 erreur sur notre référence si le numéro de commande est null --- .../faxtomail/ui/swing/content/reply/ReplyFormUIHandler.java | 7 ++++++- .../src/main/resources/i18n/faxtomail-ui-swing_fr_FR.properties | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply/ReplyFormUIHandler.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply/ReplyFormUIHandler.java index bfbf7d3b..3eb83530 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply/ReplyFormUIHandler.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply/ReplyFormUIHandler.java @@ -604,7 +604,12 @@ public class ReplyFormUIHandler extends AbstractFaxToMailUIHandler<ReplyFormUIMo refs += t("faxtomail.reply.projectReference", projectReference); } if (StringUtils.isNotBlank(companyReference) || StringUtils.isNotBlank(commandNumber)) { - refs += t("faxtomail.reply.companyReference", companyReference, commandNumber); + if (StringUtils.isBlank(companyReference)) { + companyReference = commandNumber; + } else if (StringUtils.isNotBlank(commandNumber)) { + companyReference += " " + commandNumber; + } + refs += t("faxtomail.reply.companyReference", companyReference); } if (StringUtils.isNotBlank(refs)) { refs += "<br>"; diff --git a/faxtomail-ui-swing/src/main/resources/i18n/faxtomail-ui-swing_fr_FR.properties b/faxtomail-ui-swing/src/main/resources/i18n/faxtomail-ui-swing_fr_FR.properties index 32fc6c66..53348fb3 100644 --- a/faxtomail-ui-swing/src/main/resources/i18n/faxtomail-ui-swing_fr_FR.properties +++ b/faxtomail-ui-swing/src/main/resources/i18n/faxtomail-ui-swing_fr_FR.properties @@ -315,7 +315,7 @@ faxtomail.reply.action.validate.tip=Envoyer la réponse au mail faxtomail.reply.attachment.label=%1$s (%2$s ko) faxtomail.reply.attachments.add.label=Ajouter des pièces jointes faxtomail.reply.attachments.title=Pièces-jointes (%1$s / %2$s ko autorisés) -faxtomail.reply.companyReference=Notre référence \: %1$s %2$s<br> +faxtomail.reply.companyReference=Notre référence \: %1$s <br> faxtomail.reply.forward=Transfert de la réponse \: %s faxtomail.reply.forwardsubject=Tr\: %s faxtomail.reply.label.cc=Copie \: -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.