From efa2593fca5426bf31a8e573ee4dfad072d4e0df Mon Sep 17 00:00:00 2001
From: "hamza.hramchi" <hamza.hramchi@xelians.fr>
Date: Wed, 28 Oct 2020 16:39:35 +0100
Subject: [PATCH] FEAT #15314 TIME 0:03 delete an information in the import of
users and contacts
---
.../contact/list/import/contact-import.component.html | 4 ++--
.../user/import/users-import.component.html | 9 ++++-----
src/lang/lang-fr.json | 1 -
3 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/src/frontend/app/administration/contact/list/import/contact-import.component.html b/src/frontend/app/administration/contact/list/import/contact-import.component.html
index 6ae8bf81be5..123e6286cd4 100644
--- a/src/frontend/app/administration/contact/list/import/contact-import.component.html
+++ b/src/frontend/app/administration/contact/list/import/contact-import.component.html
@@ -78,13 +78,13 @@
</mat-table>
</div>
</div>
- <div class="alert-message alert-message-info" [innerHTML]="'lang.infoImportcontacts' | translate"
+ <div class="alert-message alert-message-info" [innerHTML]="'lang.infoImportNoIdToCreate' | translate"
style="min-width: 100%">
</div>
<div class="alert-message alert-message-info" [innerHTML]="'lang.infoImportcontacts2' | translate"
style="min-width: 100%">
</div>
- <div class="alert-message alert-message-info" [innerHTML]="'lang.infoImportNoIdToCreate' | translate" style="min-width: 100%"></div>
+
</ng-template>
</div>
<span class="divider-modal"></span>
diff --git a/src/frontend/app/administration/user/import/users-import.component.html b/src/frontend/app/administration/user/import/users-import.component.html
index 4ba5e0d194d..f81faf67fe0 100644
--- a/src/frontend/app/administration/user/import/users-import.component.html
+++ b/src/frontend/app/administration/user/import/users-import.component.html
@@ -63,13 +63,12 @@
<mat-header-row *matHeaderRowDef="userColmuns"></mat-header-row>
<mat-row *matRowDef="let row; columns: userColmuns;"></mat-row>
</mat-table>
- <div class="alert-message alert-message-info"
- [innerHTML]="'lang.infoImportusers' | translate" style="min-width: 100%">
- </div>
+ <div class="alert-message alert-message-info" [innerHTML]="'lang.infoImportNoIdToCreate' | translate"
+ style="min-width: 100%">
+ </div>
<div class="alert-message alert-message-info"
[innerHTML]="'lang.infoImportusers2' | translate" style="min-width: 100%">
- </div>
- <div class="alert-message alert-message-info" [innerHTML]="'lang.infoImportNoIdToCreate' | translate" style="min-width: 100%"></div>
+ </div>
</ng-template>
</div>
<span class="divider-modal"></span>
diff --git a/src/lang/lang-fr.json b/src/lang/lang-fr.json
index a0c970033b4..f63482fd80d 100644
--- a/src/lang/lang-fr.json
+++ b/src/lang/lang-fr.json
@@ -2004,7 +2004,6 @@
"arReceived": "AR réceptionné",
"arAlreadyReceived": "Cet AR a déjà été reçu",
"contactsOfFile": "Contact du fichier",
- "infoImportcontacts": "La colonne <b>id</b> est utilisée pour identifier un contact",
"infoImportcontacts2": "Les valeurs <b>vides</b> ne sont <b>pas</b> prises en compte par défaut lors de modifications de contacts",
"importContacts": "Importer des contacts",
"argumentCivilityNotCorrect": "La donnée civility n'est pas une civilité valide pour un contact",
--
GitLab