From 00433840c0bc884ffc93d5a812bf056f6d50dc6e Mon Sep 17 00:00:00 2001
From: "florian.azizian" <florian.azizian@maarch.org>
Date: Thu, 7 Mar 2019 23:34:24 +0100
Subject: [PATCH] wording action AR
---
src/core/lang/lang-en.php | 2 --
src/core/lang/lang-fr.php | 2 --
src/core/lang/lang-nl.php | 1 -
...nowledgement-receipt-action.component.html | 20 +++++++++++++++----
src/frontend/lang/lang-en.ts | 4 ++++
src/frontend/lang/lang-fr.ts | 6 ++++++
src/frontend/lang/lang-nl.ts | 4 ++++
7 files changed, 30 insertions(+), 9 deletions(-)
diff --git a/src/core/lang/lang-en.php b/src/core/lang/lang-en.php
index 92174ed6e89..d8e249dbeab 100755
--- a/src/core/lang/lang-en.php
+++ b/src/core/lang/lang-en.php
@@ -388,8 +388,6 @@ define('_PURGE_LETTER', 'Purge the mail after archiving');
define('_RESET_LETTER', 'Reset workflow');
define('_SIMPLE_CONFIRM_WITH_UPDATE_DATE', 'Confirm and update departure date');
define('_NOT_INCOMING_CATEGORY', 'Not incomping category');
-define('_AR_ALREADY_SEND', 'Acknowledgement receipt already send');
-define('_AR_ALREADY_GENERATED', 'Acknowledgement receipt generated but not sent');
define('_NO_CONTACT', 'No associated contact');
define('_USER_MISSING_INFORMATIONS', 'Missing informations in contact card');
define('_NO_TEMPLATE', 'No template');
diff --git a/src/core/lang/lang-fr.php b/src/core/lang/lang-fr.php
index e7b847ad00d..13450bd7a57 100755
--- a/src/core/lang/lang-fr.php
+++ b/src/core/lang/lang-fr.php
@@ -388,8 +388,6 @@ define('_PURGE_LETTER', 'Purger le courrier apres l\'archivage');
define('_RESET_LETTER', 'Remise à zéro du circuit de traitement');
define('_SIMPLE_CONFIRM_WITH_UPDATE_DATE', 'Confirmation et mise à jour de la date de départ');
define('_NOT_INCOMING_CATEGORY', 'Catégorie différente de \'Courrier arrivée\'');
-define('_AR_ALREADY_SEND', 'Accusé de réception déjà envoyé');
-define('_AR_ALREADY_GENERATED', 'Accusé de réception généré mais non envoyé');
define('_NO_CONTACT', 'Pas de contact associé');
define('_USER_MISSING_INFORMATIONS', 'Informations incomplètes sur la fiche du contact');
define('_NO_TEMPLATE', 'Pas de modèle');
diff --git a/src/core/lang/lang-nl.php b/src/core/lang/lang-nl.php
index eafc0d8851a..a2902c693ce 100644
--- a/src/core/lang/lang-nl.php
+++ b/src/core/lang/lang-nl.php
@@ -387,7 +387,6 @@ define('_PURGE_LETTER', 'De brief vrijmaken na de archivering');
define('_RESET_LETTER', 'Reset van het verwerkingscircuit');
define('_SIMPLE_CONFIRM_WITH_UPDATE_DATE', 'Bevestiging en bijwerking van de vertrekdatum');
define('_NOT_INCOMING_CATEGORY', 'Categorie verschillend van \'Inkomende post\''); //_TO_TRANSLATE
-define('_AR_ALREADY_SEND', 'Ontvangstbevestiging reeds verzonden'); //_TO_TRANSLATE
define('_AR_ALREADY_GENERATED', 'Ontvangstbevestiging gegenereerd maar niet verzonden'); //_TO_TRANSLATE
define('_NO_CONTACT', 'Geen bijbehorend contact'); //_TO_TRANSLATE
define('_USER_MISSING_INFORMATIONS', 'Ontbrekende informatie op de contactkaart'); //_TO_TRANSLATE
diff --git a/src/frontend/app/actions/create-acknowledgement-receipt-action/create-acknowledgement-receipt-action.component.html b/src/frontend/app/actions/create-acknowledgement-receipt-action/create-acknowledgement-receipt-action.component.html
index 81c33347261..90c9a9a478e 100644
--- a/src/frontend/app/actions/create-acknowledgement-receipt-action/create-acknowledgement-receipt-action.component.html
+++ b/src/frontend/app/actions/create-acknowledgement-receipt-action/create-acknowledgement-receipt-action.component.html
@@ -12,7 +12,7 @@
<div *ngIf="acknowledgement.alreadySend.number">
<div class="alert-message alert-message-info acknowledgementList" role="alert">
<p>
- <b>{{acknowledgement.alreadySend.number}}</b> accusé(s) de réception déjà envoyé(s) :
+ <b>{{acknowledgement.alreadySend.number}}</b> {{lang.arAlreadySend}} :
</p>
<ul>
<li *ngFor="let info of acknowledgement.alreadySend.list">
@@ -21,9 +21,21 @@
</ul>
</div>
</div>
+ <div *ngIf="acknowledgement.alreadyGenerated.number">
+ <div class="alert-message alert-message-info acknowledgementList" role="alert">
+ <p>
+ <b>{{acknowledgement.alreadyGenerated.number}}</b> {{lang.arAlreadyGenerated}} :
+ </p>
+ <ul>
+ <li *ngFor="let info of acknowledgement.alreadyGenerated.list">
+ {{info.alt_identifier}}
+ </li>
+ </ul>
+ </div>
+ </div>
<div *ngIf="acknowledgement.noSendAR.number">
<div class="alert-message alert-message-danger acknowledgementList" role="alert">
- <p><b>{{acknowledgement.noSendAR.number}}</b> accusé(s) de réception impossible à envoyer :</p>
+ <p><b>{{acknowledgement.noSendAR.number}}</b> {{lang.canNotSendAr}} :</p>
<ul>
<li *ngFor="let info of acknowledgement.noSendAR.list">
<b >{{info.alt_identifier != null ? info.alt_identifier : lang.undefined}}</b> : {{info.info}}
@@ -35,11 +47,11 @@
<div *ngIf="acknowledgement.sendEmail || acknowledgement.sendPaper" class="alert-message alert-message-success acknowledgementList" role="alert" style="padding: 10px;">
<div *ngIf="acknowledgement.sendEmail">
<b>{{acknowledgement.sendEmail}}</b>
- accusé(s) de réception électronique prêt à être envoyé(s)
+ {{lang.readyToSendElectronicAr}}
</div>
<div *ngIf="acknowledgement.sendPaper">
<b>{{acknowledgement.sendPaper}}</b>
- accusé(s) de réception papier prêt à être généré(s)
+ {{lang.readyToGeneratePaperAr}}
</div>
</div>
</div>
diff --git a/src/frontend/lang/lang-en.ts b/src/frontend/lang/lang-en.ts
index f118423a249..10d39365bdd 100755
--- a/src/frontend/lang/lang-en.ts
+++ b/src/frontend/lang/lang-en.ts
@@ -870,4 +870,8 @@ export const LANG_EN = {
"acknowledgementSendDate" : "Acknowledgement send date",
"updateAcknowledgementSendDate" : "This will update send date for paper acknowledgement receipt",
"mustCompleteAR" : "You must complete one of two acknowledgement of receipts",
+ "arAlreadySend" : "Acknowledgement receipt already send",
+ "arAlreadyGenerated" : "Acknowledgement receipt generated but not sent",
+ "readyToSendElectronicAr" : "electronic acknowledgement receipt ready to be send",
+ "readyToGeneratePaperAr" : "paper acknowledgement receipt ready to be generated"
};
diff --git a/src/frontend/lang/lang-fr.ts b/src/frontend/lang/lang-fr.ts
index 637570461c4..eaed1f3a8c5 100755
--- a/src/frontend/lang/lang-fr.ts
+++ b/src/frontend/lang/lang-fr.ts
@@ -895,4 +895,10 @@ export const LANG_FR = {
"acknowledgementSendDate" : "Date d'envoi de l'accusé de reception",
"updateAcknowledgementSendDate" : "Cela mettra à jour la date d'envoi pour les accusés de réception papier",
"mustCompleteAR" : "Veuillez compléter un des deux modèles d'AR",
+ "arAlreadySend" : "accusé(s) de réception déjà envoyé(s)",
+ "arAlreadyGenerated" : "accusé(s) de réception déjà généré(s)",
+ "canNotSendAr" : "accusé(s) de réception impossible à envoyer",
+ "readyToSendElectronicAr" : "accusé(s) de réception électronique prêt à être envoyé(s)",
+ "readyToGeneratePaperAr" : "accusé(s) de réception papier prêt à être généré(s)"
+
};
diff --git a/src/frontend/lang/lang-nl.ts b/src/frontend/lang/lang-nl.ts
index 89d323a8b1c..eac78061e2b 100755
--- a/src/frontend/lang/lang-nl.ts
+++ b/src/frontend/lang/lang-nl.ts
@@ -898,4 +898,8 @@ export const LANG_NL = {
"acknowledgementSendDate" : "Acknowledgement send date", //_TO_TRANSLATE
"updateAcknowledgementSendDate" : "This will update send date for paper acknowledgement receipt", //_TO_TRANSLATE
"mustCompleteAR" : "You must complete one of two acknowledgement of receipts", //_TO_TRANSLATE
+ "arAlreadySend" : "Acknowledgement receipt already send", //_TO_TRANSLATE
+ "arAlreadyGenerated" : "Acknowledgement receipt generated but not sent", //_TO_TRANSLATE
+ "readyToSendElectronicAr" : "electronic acknowledgement receipt ready to be send", //_TO_TRANSLATE
+ "readyToGeneratePaperAr" : "paper acknowledgement receipt ready to be generated", //_TO_TRANSLATE
};
--
GitLab