From 79453f4cd1da4b9f5c239517b5f822d080d6611a Mon Sep 17 00:00:00 2001
From: "florian.azizian" <florian.azizian@maarch.org>
Date: Fri, 24 Jan 2020 14:54:02 +0100
Subject: [PATCH] FIX #12622 TIME 0:10 wording + disable m2m_annuary_id field
---
.../contact/page/form/contacts-form.component.ts | 4 ++--
src/frontend/lang/lang-en.ts | 1 +
src/frontend/lang/lang-fr.ts | 1 +
src/frontend/lang/lang-nl.ts | 1 +
4 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/frontend/app/administration/contact/page/form/contacts-form.component.ts b/src/frontend/app/administration/contact/page/form/contacts-form.component.ts
index 4a50925405a..289b37ec41e 100644
--- a/src/frontend/app/administration/contact/page/form/contacts-form.component.ts
+++ b/src/frontend/app/administration/contact/page/form/contacts-form.component.ts
@@ -234,7 +234,7 @@ export class ContactsFormComponent implements OnInit {
id: 'externalId_m2m',
unit: 'complement',
label: this.lang.IdMaarch2Gec,
- desc: `Format attendu : SIRET/ENTITY_ID de l'entité destinatrice (${this.lang.see} <a href="${this.maarch2GecUrl}" target="_blank">MAARCH2GEC</a>)`,
+ desc: `${this.lang.m2mContactInfo} (${this.lang.see} <a href="${this.maarch2GecUrl}" target="_blank">MAARCH2GEC</a>)`,
type: 'string',
control: new FormControl(),
required: false,
@@ -824,7 +824,7 @@ export class ContactsFormComponent implements OnInit {
unit: 'complement',
label: 'm2m_annuary_id',
type: 'string',
- control: new FormControl({disabled: true}),
+ control: new FormControl({ value: '', disabled: true }),
required: false,
display: true,
filling: false,
diff --git a/src/frontend/lang/lang-en.ts b/src/frontend/lang/lang-en.ts
index e0133957e22..92a78e24763 100755
--- a/src/frontend/lang/lang-en.ts
+++ b/src/frontend/lang/lang-en.ts
@@ -1440,6 +1440,7 @@ export const LANG_EN = {
"searchCommunicationMean": "Search communication mean",
"searchExternalIdM2M": "Search M2GEC Identifier",
"goToFolder": "Go to folder",
+ "m2mContactInfo": "Expected Format : SIRET/ENTITY_ID of destination entity",
"ADD": "Add",
"UP": "Update",
"DEL": "Delete",
diff --git a/src/frontend/lang/lang-fr.ts b/src/frontend/lang/lang-fr.ts
index 414991920f1..a129a815713 100755
--- a/src/frontend/lang/lang-fr.ts
+++ b/src/frontend/lang/lang-fr.ts
@@ -1480,6 +1480,7 @@ export const LANG_FR = {
"searchCommunicationMean": "Recherchez un moyen de communication",
"searchExternalIdM2M": "Recherchez un identifiant M2GEC",
"goToFolder": "Accéder au dossier",
+ "m2mContactInfo": "Format attendu : SIRET/ENTITY_ID de l'entité destinatrice",
"ADD": "Ajout",
"UP": "Modification",
"DEL": "Suppression",
diff --git a/src/frontend/lang/lang-nl.ts b/src/frontend/lang/lang-nl.ts
index 8b7ed428f7f..8343c18e79f 100755
--- a/src/frontend/lang/lang-nl.ts
+++ b/src/frontend/lang/lang-nl.ts
@@ -1465,6 +1465,7 @@ export const LANG_NL = {
"searchCommunicationMean": "Search communication mean", //_TO_TRANSLATE
"searchExternalIdM2M": "Search M2GEC Identifier", //_TO_TRANSLATE
"goToFolder": "Go to folder", //_TO_TRANSLATE
+ "m2mContactInfo": "Expected Format : SIRET/ENTITY_ID of destination entity", //_TO_TRANSLATE
"ADD": "Add", //_TO_TRANSLATE
"UP": "Update", //_TO_TRANSLATE
"DEL": "Delete", //_TO_TRANSLATE
--
GitLab