diff --git a/src/frontend/app/sentResource/sent-resource-list.component.ts b/src/frontend/app/sentResource/sent-resource-list.component.ts index ef70cb37f46af2e20d71f85b4606ab307947b130..0fb0c3721dfa777b9577086d25dcc37923c62000 100644 --- a/src/frontend/app/sentResource/sent-resource-list.component.ts +++ b/src/frontend/app/sentResource/sent-resource-list.component.ts @@ -74,11 +74,13 @@ export class SentResourceListComponent implements OnInit { if (!this.functions.empty(item.contact.email)) { email = item.contact.email; } else { - email = this.lang.contactDeleted; + email = this.lang.withoutEmail; } let name; - if (!this.functions.empty(item.contact.firstname) && !this.functions.empty(item.contact.lastname)) { - name = `${item.contact.firstname} ${item.contact.lastname}` + if (!this.functions.empty(item.contact.firstname) || !this.functions.empty(item.contact.lastname)) { + name = item.contact.firstname + ' ' + item.contact.lastname; + } else if (!this.functions.empty(item.contact.company)) { + name = item.contact.company; } else { name = this.lang.contactDeleted; } diff --git a/src/frontend/app/sentResource/sent-resource-page/sent-resource-page.component.ts b/src/frontend/app/sentResource/sent-resource-page/sent-resource-page.component.ts index d6e03146515f585a8e4474dade222153ef0323f5..21e3cb872aeb3054768d0868ff6daeb882cc3ebc 100644 --- a/src/frontend/app/sentResource/sent-resource-page/sent-resource-page.component.ts +++ b/src/frontend/app/sentResource/sent-resource-page/sent-resource-page.component.ts @@ -377,7 +377,7 @@ export class SentResourcePageComponent implements OnInit { }; this.recipients = [{ label: !this.functions.empty(data.acknowledgementReceipt.contact) ? this.contactService.formatContact(data.acknowledgementReceipt.contact) : this.lang.contactDeleted, - email: !this.functions.empty(data.acknowledgementReceipt.contact.email) ? data.acknowledgementReceipt.contact.email : this.lang.contactDeleted + email: !this.functions.empty(data.acknowledgementReceipt.contact.email) ? data.acknowledgementReceipt.contact.email : this.lang.withoutEmail }]; this.emailStatus = 'SENT'; diff --git a/src/frontend/lang/lang-en.ts b/src/frontend/lang/lang-en.ts index cf8dd00c4d6767fb9a326d7af0d0bedd03e7b84c..048f2816db2781fc862d10105859d0f5282021cf 100755 --- a/src/frontend/lang/lang-en.ts +++ b/src/frontend/lang/lang-en.ts @@ -1580,6 +1580,7 @@ export const LANG_EN = { "mailing" : "Mailing", "goToBasket" : "Go to basket...", "manualSendingAR" : "Manual sending...", + "withoutEmail" : "Without email", "enableMailing" : "Enable mailing", "disableMailing" : "Disable mailing", "selectContact" : "select a contact", diff --git a/src/frontend/lang/lang-fr.ts b/src/frontend/lang/lang-fr.ts index b00c8c11bbc695de6219bdb92ae845ea0b22b08e..24843307aea482deb1eecbf4bd523ac35a9f3600 100755 --- a/src/frontend/lang/lang-fr.ts +++ b/src/frontend/lang/lang-fr.ts @@ -1618,7 +1618,8 @@ export const LANG_FR = { "willBeDeletedAndMerged" : "sera supprimé et fusionné avec le mot-clé", "mailing" : "Publipostage", "goToBasket" : "Accéder à la bannette...", - "manualSendingAR" : "En cours d'envoi manuel...", + "manualSendingAR" : "Généré pour envoi manuel...", + "withoutEmail" : "Sans courriel", "enableMailing" : "Activer le publipostage", "disableMailing" : "Désactiver le publipostage", "selectContact" : "Sélectionner un contact", diff --git a/src/frontend/lang/lang-nl.ts b/src/frontend/lang/lang-nl.ts index 5457fb211a046191b287fe57a22d7c0863511b5d..88224385af1a1dd6d7b0f1fcbe3bdf362cc11b1f 100755 --- a/src/frontend/lang/lang-nl.ts +++ b/src/frontend/lang/lang-nl.ts @@ -1605,6 +1605,7 @@ export const LANG_NL = { "mailing" : "Mailing", //_TO_TRANSLATE "goToBasket" : "Go to basket...", //_TO_TRANSLATE "manualSendingAR" : "Manual sending...", //_TO_TRANSLATE + "withoutEmail" : "Without email", //_TO_TRANSLATE "enableMailing" : "Enable mailing", //_TO_TRANSLATE "disableMailing" : "Disable mailing", //_TO_TRANSLATE "selectContact" : "select a contact", //_TO_TRANSLATE