From 07576b9f56c9471d67b74cc2ff9d4d7ae7f25d78 Mon Sep 17 00:00:00 2001 From: Alex ORLUC <alex.orluc@maarch.org> Date: Mon, 16 Sep 2019 18:51:33 +0200 Subject: [PATCH] FIX #11269 TIME 0:15 fix var lang --- .../indexing-form/indexing-form.component.ts | 22 ++++++++++++------- .../summarySheet/summary-sheet.component.ts | 4 ++-- src/frontend/lang/lang-fr.ts | 2 +- 3 files changed, 17 insertions(+), 11 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 e12a10e4ed1..ac98e531699 100644 --- a/src/frontend/app/indexation/indexing-form/indexing-form.component.ts +++ b/src/frontend/app/indexation/indexing-form/indexing-form.component.ts @@ -30,7 +30,7 @@ export class IndexingFormComponent implements OnInit { indexingModelsCore: any[] = [ { identifier: 'category_id', - label: 'Catégorie', + label: this.lang.category_id, unit: 'mail', type: 'select', system: true, @@ -39,7 +39,7 @@ export class IndexingFormComponent implements OnInit { }, { identifier: 'doctype', - label: 'Type de courrier', + label: this.lang.doctype, unit: 'mail', type: 'select', system: true, @@ -48,7 +48,7 @@ export class IndexingFormComponent implements OnInit { }, { identifier: 'docDate', - label: 'Date du courrier', + label: this.lang.docDate, unit: 'mail', type: 'date', system: true, @@ -57,7 +57,7 @@ export class IndexingFormComponent implements OnInit { }, { identifier: 'arrivalDate', - label: 'Date d\'arrivée', + label: this.lang.arrivalDate, unit: 'mail', type: 'date', system: true, @@ -66,7 +66,7 @@ export class IndexingFormComponent implements OnInit { }, { identifier: 'subject', - label: 'Objet', + label: this.lang.subject, unit: 'mail', type: 'string', system: true, @@ -75,7 +75,7 @@ export class IndexingFormComponent implements OnInit { }, { identifier: 'contact', - label: 'Expéditeur', + label: this.lang.getSenders, unit: 'contact', type: 'string', system: true, @@ -84,7 +84,7 @@ export class IndexingFormComponent implements OnInit { }, { identifier: 'destination', - label: 'Service traitant', + label: this.lang.destination, unit: 'process', type: 'select', system: true, @@ -93,7 +93,7 @@ export class IndexingFormComponent implements OnInit { }, { identifier: 'folder', - label: 'Dossier', + label: this.lang.folder, unit: 'classement', type: 'string', system: true, @@ -115,6 +115,12 @@ export class IndexingFormComponent implements OnInit { indexingModelsCustomFields: any[] = []; availableFields: any[] = [ + { + identifier: 'recipient', + label: this.lang.getRecipients, + type: 'string', + values: [] + }, { identifier: 'priority', label: this.lang.priority, diff --git a/src/frontend/app/list/summarySheet/summary-sheet.component.ts b/src/frontend/app/list/summarySheet/summary-sheet.component.ts index 68d24356cbf..84cb62b9d69 100644 --- a/src/frontend/app/list/summarySheet/summary-sheet.component.ts +++ b/src/frontend/app/list/summarySheet/summary-sheet.component.ts @@ -78,7 +78,7 @@ export class SummarySheetComponent implements OnInit { label: this.lang.avis, css: 'col-md-4 text-center', desc: [ - this.lang.firstname + ' ' + this.lang.lastname + ' (' + this.lang.destination + ')', + this.lang.firstname + ' ' + this.lang.lastname + ' (' + this.lang.destination.toLowerCase() + ')', this.lang.role, this.lang.processDate ], @@ -90,7 +90,7 @@ export class SummarySheetComponent implements OnInit { label: this.lang.visaWorkflow, css: 'col-md-4 text-center', desc: [ - this.lang.firstname + ' ' + this.lang.lastname + ' (' + this.lang.destination + ')', + this.lang.firstname + ' ' + this.lang.lastname + ' (' + this.lang.destination.toLowerCase() + ')', this.lang.role, this.lang.processDate ], diff --git a/src/frontend/lang/lang-fr.ts b/src/frontend/lang/lang-fr.ts index 41ee91d7f24..13c823fc952 100755 --- a/src/frontend/lang/lang-fr.ts +++ b/src/frontend/lang/lang-fr.ts @@ -289,7 +289,7 @@ export const LANG_FR = { "descOrder" : "Ordre descendant", "description" : "Description", "dest_user" : "Attributaire", - "destination" : "entité traitante", + "destination" : "Entité traitante", "destinationChangingInfo" : "Le courrier sera réattribué à l'entité", "destinationChangingInfoMass" : "Les courriers issus d'une entité externe à ", "destinationChangingInfoMass2" : "seront redirigés à l'entité", -- GitLab