From 341b8a91ea5f3a19331b4526d17751720f1e25a8 Mon Sep 17 00:00:00 2001
From: Guillaume Heurtier <guillaume.heurtier@maarch.org>
Date: Thu, 3 Dec 2020 15:54:38 +0100
Subject: [PATCH] FEAT #15479 TIME 0:35 updated wording
---
.../acknowledgement-reception.component.ts | 6 +++++-
src/lang/lang-en.json | 5 +++--
src/lang/lang-fr.json | 5 +++--
3 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/src/frontend/app/registeredMail/acknowledgement-reception/acknowledgement-reception.component.ts b/src/frontend/app/registeredMail/acknowledgement-reception/acknowledgement-reception.component.ts
index 0c923ead809..164a2ce928b 100644
--- a/src/frontend/app/registeredMail/acknowledgement-reception/acknowledgement-reception.component.ts
+++ b/src/frontend/app/registeredMail/acknowledgement-reception/acknowledgement-reception.component.ts
@@ -93,10 +93,14 @@ export class AcknowledgementReceptionComponent implements OnInit {
return;
}
if (this.type === 'notDistributed') {
- if (!this.adminFormGroup.get('receivedDate').valid || !this.adminFormGroup.get('returnReason').valid) {
+ if (!this.adminFormGroup.get('receivedDate').valid) {
this.notify.error(this.translate.instant('lang.fieldsNotValid'));
return;
}
+ if (!this.adminFormGroup.get('returnReason').valid) {
+ this.notify.error(this.translate.instant('lang.selectReturnReason'));
+ return;
+ }
if (this.reason === this.translate.instant('lang.others') && this.functions.empty(this.reasonOther)) {
this.notify.error(this.translate.instant('lang.fieldsNotValid'));
return;
diff --git a/src/lang/lang-en.json b/src/lang/lang-en.json
index a8ae8d7a49b..7aabfd170f2 100644
--- a/src/lang/lang-en.json
+++ b/src/lang/lang-en.json
@@ -2019,7 +2019,7 @@
"confirmImportContacts": "Do you want to import <b>{{0}}</b> contacts",
"importedContacts": "imported contacts",
"registeredMailNotFound": "This registered mail does not exist",
- "registeredMailNotInDepositList": "This registered mail is not in a deposit list",
+ "registeredMailNotInDepositList": "This registered mail is not in a deposit list and so was not sent",
"getResId": "Res ID",
"getResIdSample": "420",
"getBarcode": "Barcode",
@@ -2176,5 +2176,6 @@
"templateNameMandatory": "Template name mandatory",
"attachmentTypeUsed": "This type is used in attachment",
"confirmRescanTitle": "Registered mail not distributed",
- "confirmRescan": "This registerde mail was already scanned Not distributed. Do you want to rescan it to distributed ?"
+ "confirmRescan": "This registerde mail was already scanned Not distributed. Do you want to rescan it to distributed ?",
+ "selectReturnReason": "Please select a return reason"
}
diff --git a/src/lang/lang-fr.json b/src/lang/lang-fr.json
index 4cd7cc27303..2e46284dbcf 100644
--- a/src/lang/lang-fr.json
+++ b/src/lang/lang-fr.json
@@ -2021,7 +2021,7 @@
"confirmImportContacts": "Voulez-vous importer <b>{{0}}</b> contacts",
"importedContacts": "contacts importés",
"registeredMailNotFound": "Ce recommandé n'existe pas",
- "registeredMailNotInDepositList": "Ce recommandé n'est pas dans un descriptif de pli",
+ "registeredMailNotInDepositList": "Ce recommandé n'est pas dans un descriptif de pli et n'a donc pas été envoyé",
"toggleEmptyValues": "Prendre en compte les valeurs vides",
"emptyValue": "Valeur vide",
"templateUsed": "Structure utilisée",
@@ -2187,5 +2187,6 @@
"attachmentTypeUsed": "Ce type est utilisé pour certaines pièces jointes",
"receptionCanceled": "Réception annulée",
"confirmRescanTitle": "Recommandé non distribué",
- "confirmRescan": "Ce recommandé a déjà été scanné Non distribué. Voulez-vous le rescanner en distribué ?"
+ "confirmRescan": "Ce recommandé a déjà été scanné Non distribué. Voulez-vous le rescanner en distribué ?",
+ "selectReturnReason": "Veuillez sélectionner un motif de retour"
}
--
GitLab