From 12c60a26c8ed4876a2e0bc12be572224fc49b668 Mon Sep 17 00:00:00 2001 From: Alex ORLUC <alex.orluc@maarch.org> Date: Mon, 23 Sep 2019 19:09:48 +0200 Subject: [PATCH] FIX #11271 TIME 0:10 fix label initiator --- .../indexation/indexing-form/indexing-form.component.ts | 7 ++++--- src/frontend/lang/lang-en.ts | 1 + src/frontend/lang/lang-fr.ts | 3 ++- src/frontend/lang/lang-nl.ts | 1 + 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/frontend/app/indexation/indexing-form/indexing-form.component.ts b/src/frontend/app/indexation/indexing-form/indexing-form.component.ts index 64fffa274b9..ce0ab05b656 100644 --- a/src/frontend/app/indexation/indexing-form/indexing-form.component.ts +++ b/src/frontend/app/indexation/indexing-form/indexing-form.component.ts @@ -82,7 +82,7 @@ export class IndexingFormComponent implements OnInit { values: [] }, { - identifier: 'getSenders', + identifier: 'senders', label: this.lang.getSenders, unit: 'contact', type: 'autocomplete', @@ -149,7 +149,7 @@ export class IndexingFormComponent implements OnInit { }, { identifier: 'initiator', - label: this.lang.initiator, + label: this.lang.initiatorEntityAlt, type: 'select', default_value : '', values: [] @@ -498,13 +498,13 @@ export class IndexingFormComponent implements OnInit { } else { data.indexingModel.fields.forEach((field: any) => { fieldExist = false; - field.label = this.lang[field.identifier]; field.system = false; field.values = []; let indexFound = this.availableFields.map(avField => avField.identifier).indexOf(field.identifier); if (indexFound > -1) { + field.label = this.availableFields[indexFound].label; field.values = this.availableFields[indexFound].values; field.type = this.availableFields[indexFound].type; this.availableFields.splice(indexFound, 1); @@ -524,6 +524,7 @@ export class IndexingFormComponent implements OnInit { indexFound = this.indexingModelsCore.map(info => info.identifier).indexOf(field.identifier); if (indexFound > -1) { + field.label = this.indexingModelsCore[indexFound].label; field.values = this.indexingModelsCore[indexFound].values; field.type = this.indexingModelsCore[indexFound].type; fieldExist = true; diff --git a/src/frontend/lang/lang-en.ts b/src/frontend/lang/lang-en.ts index a88269b0b7b..1b995e18787 100755 --- a/src/frontend/lang/lang-en.ts +++ b/src/frontend/lang/lang-en.ts @@ -1119,4 +1119,5 @@ export const LANG_EN = { "integerInput" : "Input number", "noSelectedValue" : "No selected value", "searchValue" : "Search a value", + "initiatorEntityAlt" : "Initiator entity", }; diff --git a/src/frontend/lang/lang-fr.ts b/src/frontend/lang/lang-fr.ts index f19777710fb..67061e5a18f 100755 --- a/src/frontend/lang/lang-fr.ts +++ b/src/frontend/lang/lang-fr.ts @@ -1155,5 +1155,6 @@ export const LANG_FR = { "indexingModelCreation" : "Création d'un modèle d'enregistrement", "integerInput" : "Champ numérique", "noSelectedValue" : "Aucun élément sélectionné", - "searchValue" : "Rechercher un élément", + "searchValue" : "Rechercher un élément", + "initiatorEntityAlt" : "Entité initiatrice", }; diff --git a/src/frontend/lang/lang-nl.ts b/src/frontend/lang/lang-nl.ts index ec088113bb6..6971e145e32 100755 --- a/src/frontend/lang/lang-nl.ts +++ b/src/frontend/lang/lang-nl.ts @@ -1145,4 +1145,5 @@ export const LANG_NL = { "integerInput" : "Input number", //_TO_TRANSLATE "noSelectedValue" : "No selected value", //_TO_TRANSLATE "searchValue" : "Search a value", //_TO_TRANSLATE + "initiatorEntityAlt" : "Initiator entity", //_TO_TRANSLATE }; -- GitLab