From d9a17fae6e1ac4d0eaf7869aef19c83f0a4d6892 Mon Sep 17 00:00:00 2001
From: Nestor <npegane@hotmail.com>
Date: Fri, 18 May 2018 09:58:36 +0200
Subject: [PATCH] FEAT #7678 lang var in signature book
---
.../Views/signature-book.component.html | 62 +++++++++----------
.../angular/app/signature-book.component.ts | 2 +
.../js/angular/lang/lang-en.ts | 21 ++++++-
.../js/angular/lang/lang-fr.ts | 23 ++++++-
src/core/lang/lang-en.php | 14 +++++
src/core/lang/lang-fr.php | 14 +++++
6 files changed, 102 insertions(+), 34 deletions(-)
diff --git a/apps/maarch_entreprise/Views/signature-book.component.html b/apps/maarch_entreprise/Views/signature-book.component.html
index c72098ee68a..d08417603e3 100755
--- a/apps/maarch_entreprise/Views/signature-book.component.html
+++ b/apps/maarch_entreprise/Views/signature-book.component.html
@@ -4,21 +4,21 @@
<div *ngIf="!loading" class='visaContent'>
<div class="titleSignatureBook">
<div id="tabSignatureBook">
- <div *ngIf="signatureBook.documents[0] && signatureBook.documents[0].category_id != 'outgoing'" title="{{signatureBook.lang.mail}}" class="item" [ngClass]="{'activeTabSignatureBook': headerTab == 1}" (click)="changeSignatureBookLeftContent(1)">
+ <div *ngIf="signatureBook.documents[0] && signatureBook.documents[0].category_id != 'outgoing'" title="{{lang.mail}}" class="item" [ngClass]="{'activeTabSignatureBook': headerTab == 1}" (click)="changeSignatureBookLeftContent(1)">
<i class="fa fa-file-text-o fa-2x"></i>
</div>
- <div title="{{signatureBook.lang.notes}}" class="item" [ngClass]="{'activeTabSignatureBook': headerTab == 2}" (click)="changeSignatureBookLeftContent(2)">
+ <div title="{{lang.notes}}" class="item" [ngClass]="{'activeTabSignatureBook': headerTab == 2}" (click)="changeSignatureBookLeftContent(2)">
<i class="fa fa-pencil fa-2x">
<sup *ngIf="signatureBook.nbNotes > 0" class="nbRes" style="font-size: 12px;font-weight: bold;">{{signatureBook.nbNotes}}</sup>
</i>
</div>
- <div title="{{signatureBook.lang.visaWorkflow}}" class="item" [ngClass]="{'activeTabSignatureBook': headerTab == 3}" (click)="changeSignatureBookLeftContent(3)">
+ <div title="{{lang.visaWorkflow}}" class="item" [ngClass]="{'activeTabSignatureBook': headerTab == 3}" (click)="changeSignatureBookLeftContent(3)">
<i class="fa fa-list-ol fa-2x"></i>
</div>
- <div title="{{signatureBook.lang.progression}}" class="item" [ngClass]="{'activeTabSignatureBook': headerTab == 4}" (click)="changeSignatureBookLeftContent(4)">
+ <div title="{{lang.progression}}" class="item" [ngClass]="{'activeTabSignatureBook': headerTab == 4}" (click)="changeSignatureBookLeftContent(4)">
<i class="fa fa-history fa-2x"></i>
</div>
- <div title="{{signatureBook.lang.links}}" class="item" [ngClass]="{'activeTabSignatureBook': headerTab == 5}" (click)="changeSignatureBookLeftContent(5)">
+ <div title="{{lang.links}}" class="item" [ngClass]="{'activeTabSignatureBook': headerTab == 5}" (click)="changeSignatureBookLeftContent(5)">
<i class="fa fa-link fa-2x">
<sup *ngIf="signatureBook.nbLinks > 0" class="nbRes" style="font-size: 12px;font-weight: bold;">{{signatureBook.nbLinks}}</sup>
</i>
@@ -29,11 +29,11 @@
<i style="cursor: pointer" (click)="backToBasket()" class="fa fa-times-circle fa-2x"></i>
</div>
<div class="actions">
- <i style="cursor: pointer;vertical-align: middle;" title="{{signatureBook.lang.linkDetails}}" class="fa fa-info-circle fa-2x" (click)="backToDetails()"></i>
+ <i style="cursor: pointer;vertical-align: middle;" title="{{lang.linkDetails}}" class="fa fa-info-circle fa-2x" (click)="backToDetails()"></i>
<select id="signatureBookActions">
<option *ngFor="let option of signatureBook.actions" value="{{option.value}}">{{option.label}}</option>
</select>
- <input name="send" id="send" value="{{signatureBook.lang.validate}}" class="button" type="button" (click)="validForm()">
+ <input name="send" id="send" value="{{lang.validate}}" class="button" type="button" (click)="validForm()">
</div>
<div class="others" *ngIf="signatureBook.consigne != ''">
<span id="consigne">
@@ -46,21 +46,21 @@
<div class="resListContentPos">
<div class="resListContentFrame" *ngFor="let res of signatureBook.resList" (click)="changeLocation(res.res_id, 'view')" [ngClass]="{'resListContentFrameSelected': resId == res.res_id}">
<div class="resListContentInfo">
- <i class="fa fa-compass" title="{{signatureBook.lang.chrono}}"></i> {{res.alt_identifier}}
+ <i class="fa fa-compass" title="{{lang.chronoNumber}}"></i> {{res.alt_identifier}}
<i *ngIf="res.allSigned" class="fa fa-certificate"></i>
<i class="fa fa-circle" title="{{res.priorityLabel}}" aria-hidden="true" [ngStyle]="{'color': res.priorityColor}" style="position: absolute;right: 0px;top: -10px;font-size: 25px;"></i>
</div>
<div class="resListContentInfo">
- <i class="fa fa-info" title="{{signatureBook.lang.object}}"></i> {{res.subject}}
+ <i class="fa fa-info" title="{{lang.object}}"></i> {{res.subject}}
</div>
<div class="resListContentInfo">
- <i class="fa fa-book" title="{{signatureBook.lang.contactInfo}}"></i> {{res.sender}}
+ <i class="fa fa-book" title="{{lang.contactInfo}}"></i> {{res.sender}}
</div>
<div class="resListContentInfo">
- <i class="fa fa-calendar" title="{{signatureBook.lang.arrDate}}"></i> {{res.creation_date | date:'dd/MM/y'}}
+ <i class="fa fa-calendar" title="{{lang.arrivalDate}}"></i> {{res.creation_date | date:'dd/MM/y'}}
</div>
<div class="resListContentInfo" style="margin-top:-10px;">
- <i class="fa fa-bell" title="{{signatureBook.lang.processLimitDate}}"></i> {{res.process_limit_date | date:'dd/MM/y'}}
+ <i class="fa fa-bell" title="{{lang.processLimitDate}}"></i> {{res.process_limit_date | date:'dd/MM/y'}}
</div>
</div>
</div>
@@ -80,7 +80,7 @@
class="leftPanelThumbnails" [ngClass]="{'panelSelectedThumbnail': i == leftSelectedThumbnail}"/>
</div>
</div>
- <div *ngIf="signatureBook.documents.length - 1 > 0" class="pjDetailsMore" (click)="displayPanel('TOPLEFT')" title="{{signatureBook.documents.length - 1}} {{signatureBook.lang.mailAttachments}}" style="left:25px;">
+ <div *ngIf="signatureBook.documents.length - 1 > 0" class="pjDetailsMore" (click)="displayPanel('TOPLEFT')" title="{{signatureBook.documents.length - 1}} {{lang.mailAttachments}}" style="left:25px;">
<i *ngIf="!showTopLeftPanel" class="fa fa-envelope-square fa-2x" aria-hidden="true"></i>
<sup *ngIf="!showTopLeftPanel" class="nbRes" style="position: absolute;right: 6px;top: 5px;">{{signatureBook.documents.length - 1}}</sup>
<i *ngIf="showTopLeftPanel" class="fa fa-chevron-up" aria-hidden="true"></i>
@@ -89,7 +89,7 @@
<div *ngIf="leftSelectedThumbnail > 0 && signatureBook.documents[leftSelectedThumbnail].format != 'pdf' && !signatureBook.documents[leftSelectedThumbnail].isConverted" [ngStyle]="{'height': showTopLeftPanel ? '79%' : '96%'}" class="visaNoPdfWarning">
<div style="padding-top: 25%;">Aucun aperçu disponible<br/><sub>La version PDF du fichier "{{signatureBook.documents[leftSelectedThumbnail].title}}.{{signatureBook.documents[leftSelectedThumbnail].format}}" n'est pas disponible.</sub></div>
<div class="visaPjView">
- <a title="{{signatureBook.lang.dlAttachment}}" href="index.php?display=true&module=attachments&page=view_attachment&res_id_master={{resId}}&id={{signatureBook.documents[leftSelectedThumbnail].res_id}}" target="_blank">
+ <a title="{{lang.dlAttachment}}" href="index.php?display=true&module=attachments&page=view_attachment&res_id_master={{resId}}&id={{signatureBook.documents[leftSelectedThumbnail].res_id}}" target="_blank">
<i class="fa fa-download fa-2x"></i>
</a>
</div>
@@ -122,35 +122,35 @@
<div [ngStyle]="{'display': showTopRightPanel ? 'block' : 'none'}" class="pjDetails">
<div class="infoPj" title="{{signatureBook.attachments[rightSelectedThumbnail].attachment_type}}">
<label>Type : </label>
- <span>{{signatureBook.attachments[rightSelectedThumbnail].attachment_type}} <sup *ngIf="signatureBook.attachments[rightSelectedThumbnail].status == 'SIGN'" style="color:#135F7F;">{{signatureBook.lang.signed}}</sup></span>
+ <span>{{signatureBook.attachments[rightSelectedThumbnail].attachment_type}} <sup *ngIf="signatureBook.attachments[rightSelectedThumbnail].status == 'SIGN'" style="color:#135F7F;">{{lang.signed}}</sup></span>
</div>
<div class="infoPj" title="{{signatureBook.attachments[rightSelectedThumbnail].title}}">
- <label>{{signatureBook.lang.object}} : </label>
+ <label>{{lang.object}} : </label>
<span>{{signatureBook.attachments[rightSelectedThumbnail].title}}</span>
</div>
<div class="infoPj" title="{{signatureBook.attachments[rightSelectedThumbnail].destUser}}">
- <label>{{signatureBook.lang.for}} : </label>
+ <label>{{lang.for}} : </label>
<span>{{signatureBook.attachments[rightSelectedThumbnail].destUser}}</span>
</div>
<div>
<div *ngIf="!signatureBook.attachments[rightSelectedThumbnail].updated_by" title="{{signatureBook.attachments[rightSelectedThumbnail].typist}}" class="infoPj">
- <label>{{signatureBook.lang.createBy}} : </label>
+ <label>{{lang.createdBy}} : </label>
<span>{{signatureBook.attachments[rightSelectedThumbnail].typist}}</span>
</div>
<div *ngIf="signatureBook.attachments[rightSelectedThumbnail].updated_by" title="Modifié par : {{signatureBook.attachments[rightSelectedThumbnail].updated_by}} le {{signatureBook.attachments[rightSelectedThumbnail].doc_date | date:'dd/MM/y'}}" class="infoPj">
- <label><i>*</i> {{signatureBook.lang.createBy}} : </label>
+ <label><i>*</i> {{lang.createdBy}} : </label>
<span>{{signatureBook.attachments[rightSelectedThumbnail].typist}}</span>
</div>
<div class="infoPj">
- <label>{{signatureBook.lang.createOn}} : </label>
+ <label>{{lang.createdOn}} : </label>
<span>{{signatureBook.attachments[rightSelectedThumbnail].creation_date | date:'dd/MM/y à HH:mm'}}</span>
</div>
<div class="infoPj" title="{{signatureBook.attachments[rightSelectedThumbnail].validation_date | date:'dd/MM/y'}}">
- <label>{{signatureBook.lang.back}} : </label>
+ <label>{{lang.back}} : </label>
<span>{{signatureBook.attachments[rightSelectedThumbnail].validation_date | date:'dd/MM/y'}}</span>
</div>
<div class="infoPj" title="{{signatureBook.attachments[rightSelectedThumbnail].identifier}}">
- <label>{{signatureBook.lang.olyChrono}} : </label>
+ <label>{{lang.chrono}} : </label>
<span>{{signatureBook.attachments[rightSelectedThumbnail].identifier}}</span>
</div>
<div class="infoPj">
@@ -164,7 +164,7 @@
</div>
</div>
</div>
- <div class="pjDetailsMore" (click)="displayPanel('TOPRIGHT')" title="{{signatureBook.lang.details}}">
+ <div class="pjDetailsMore" (click)="displayPanel('TOPRIGHT')" title="{{lang.details}}">
<i *ngIf="!showTopRightPanel" class="fa fa-list-alt fa-2x" aria-hidden="true"></i>
<i *ngIf="showTopRightPanel" class="fa fa-chevron-up" aria-hidden="true"></i>
</div>
@@ -172,7 +172,7 @@
<div *ngIf="signatureBook.attachments[rightSelectedThumbnail].format != 'pdf' && signatureBook.attachments[rightSelectedThumbnail].status != 'TMP' && !signatureBook.attachments[rightSelectedThumbnail].isConverted" [ngStyle]="{'height': showTopRightPanel ? '79%' : '96%'}" class="visaNoPdfWarning">
<div style="padding-top: 25%;">Aucun aperçu disponible<br/><sub>La version PDF du fichier "{{signatureBook.attachments[rightSelectedThumbnail].title}}.{{signatureBook.attachments[rightSelectedThumbnail].format}}" n'est pas disponible.</sub></div>
<div class="visaPjView">
- <a title="{{signatureBook.lang.dlAttachment}}" href="index.php?display=true&module=attachments&page=view_attachment&res_id_master={{resId}}&id={{signatureBook.attachments[rightSelectedThumbnail].res_id}}" target="_blank">
+ <a title="{{lang.dlAttachment}}" href="index.php?display=true&module=attachments&page=view_attachment&res_id_master={{resId}}&id={{signatureBook.attachments[rightSelectedThumbnail].res_id}}" target="_blank">
<i class="fa fa-download fa-2x"></i>
</a>
</div>
@@ -215,24 +215,24 @@
</span>
<i *ngIf="attachment.sign && attachment.status == 'SIGN'" title="Le document a été signé" style="position: absolute;top: 12px;right: 6px;" class="fa fa-circle"></i>
<i *ngIf="attachment.sign && attachment.status != 'SIGN' && attachment.status != 'TMP'" title="Le document n'a pas encore été signé" style="position: absolute;top: 12px;right: 6px;" class="fa fa-circle-o"></i>
- <i *ngIf="attachment.sign && attachment.status == 'TMP'" style="color:green;-ms-transform: rotate(-35deg);-webkit-transform: rotate(-35deg);transform: rotate(-35deg);position: absolute;top: 39px;right: 1px;" >{{signatureBook.lang.draft}}</i>
+ <i *ngIf="attachment.sign && attachment.status == 'TMP'" style="color:green;-ms-transform: rotate(-35deg);-webkit-transform: rotate(-35deg);transform: rotate(-35deg);position: absolute;top: 39px;right: 1px;" >{{lang.draft}}</i>
<br/><i style="position: absolute;margin-left: -9px;" >.{{attachment.format}}</i>
</div>
</div>
<div style="bottom: 0px;position: absolute;width:100%;">
- <div class="panelRightListPj" (click)="displayAttachmentPanel()" title="{{signatureBook.lang.displayAtt}}" [ngClass]="{'panelSelectedThumbnail': showAttachmentPanel}">
+ <div class="panelRightListPj" (click)="displayAttachmentPanel()" title="{{lang.displayAtt}}" [ngClass]="{'panelSelectedThumbnail': showAttachmentPanel}">
<i class="fa fa-bars fa-2x" ></i>
</div>
<hr style="background-color:#666;margin-top:0px;"/>
- <div class="panelRightAddPj" (click)="addAttachmentIframe()" title="{{signatureBook.lang.createAtt}}">
+ <div class="panelRightAddPj" (click)="addAttachmentIframe()" title="{{lang.createAtt}}">
<i class="fa fa-paperclip fa-2x" ></i>
<i class="fa fa-plus" style="position:absolute;"></i>
</div>
<div *ngIf="signatureBook.attachments[rightSelectedThumbnail]">
- <div [ngClass]="{'visaDisabledButton': !signatureBook.attachments[rightSelectedThumbnail].canModify || signatureBook.attachments[rightSelectedThumbnail].status == 'SIGN'}" title="{{signatureBook.lang.updateAtt}}" class="visaPjUp" (click)="editAttachmentIframe(signatureBook.attachments[rightSelectedThumbnail])">
+ <div [ngClass]="{'visaDisabledButton': !signatureBook.attachments[rightSelectedThumbnail].canModify || signatureBook.attachments[rightSelectedThumbnail].status == 'SIGN'}" title="{{lang.updateAtt}}" class="visaPjUp" (click)="editAttachmentIframe(signatureBook.attachments[rightSelectedThumbnail])">
<i class="fa fa-pencil-square-o fa-2x"></i>
</div>
- <div [ngClass]="{'visaDisabledButton': !signatureBook.attachments[rightSelectedThumbnail].canDelete}" title="{{signatureBook.lang.deleteAtt}}" class="visaPjDel" (click)="delAttachment(signatureBook.attachments[rightSelectedThumbnail])">
+ <div [ngClass]="{'visaDisabledButton': !signatureBook.attachments[rightSelectedThumbnail].canDelete}" title="{{lang.deleteAtt}}" class="visaPjDel" (click)="delAttachment(signatureBook.attachments[rightSelectedThumbnail])">
<i class="fa fa-trash fa-2x"></i>
</div>
</div>
@@ -247,9 +247,9 @@
<div *ngFor="let version of signatureBook.attachments[rightSelectedThumbnail].obsAttachments">
<span>Version : </span>
<span>{{version.relation}}</span>
- <span>{{signatureBook.lang.object}} : </span>
+ <span>{{lang.object}} : </span>
<span>{{version.title}}</span>
- <a style="color:#135F7F" title="{{signatureBook.lang.dlAttachment}}" href="index.php?display=true&module=attachments&page=view_attachment&res_id_master={{resId}}&id={{version.resId}}" target="_blank">
+ <a style="color:#135F7F" title="{{lang.dlAttachment}}" href="index.php?display=true&module=attachments&page=view_attachment&res_id_master={{resId}}&id={{version.resId}}" target="_blank">
<i class="fa fa-download fa-2x"></i>
</a>
</div>
diff --git a/apps/maarch_entreprise/js/angular/app/signature-book.component.ts b/apps/maarch_entreprise/js/angular/app/signature-book.component.ts
index d6329d90b00..fd7ce09482c 100755
--- a/apps/maarch_entreprise/js/angular/app/signature-book.component.ts
+++ b/apps/maarch_entreprise/js/angular/app/signature-book.component.ts
@@ -1,6 +1,7 @@
import { Pipe, PipeTransform, Component, OnInit, NgZone } from '@angular/core';
import { HttpClient } from '@angular/common/http';
import { DomSanitizer } from '@angular/platform-browser';
+import { LANG } from './translate.component';
import { Router, ActivatedRoute } from '@angular/router';
declare function lockDocument(resId: number) : void;
@@ -33,6 +34,7 @@ export class SignatureBookComponent implements OnInit {
resId : number;
basketId : string;
groupId : string;
+ lang : any = LANG;
signatureBook: any = {
currentAction : {},
diff --git a/apps/maarch_entreprise/js/angular/lang/lang-en.ts b/apps/maarch_entreprise/js/angular/lang/lang-en.ts
index 64e2257a1bb..3e42c798c49 100755
--- a/apps/maarch_entreprise/js/angular/lang/lang-en.ts
+++ b/apps/maarch_entreprise/js/angular/lang/lang-en.ts
@@ -32,6 +32,7 @@ export const LANG_EN = {
"april" : "April",
"archivalAgency" : "Archival agency",
"archivalAgreement" : "Archival agreement",
+ "arrivalDate" : "Arrival date",
"assignBy" : "Assign by",
"associatedStatus" : "Associated status",
"attachment" : "Attachment",
@@ -69,12 +70,16 @@ export const LANG_EN = {
"chooseGroup" : "Choose a group",
"chooseRedirectGroup" : "Choose another group",
"chronoNumber" : "Chrono number",
+ "chrono" : "Chrono",
"city" : "City",
"clause" : "Clause",
"clickOn" : "Click on",
"color" : "Color",
"content_management" : "Ressource revision",
+ "contactInfo" : "Contact card",
"country" : "Country",
+ "createAtt" : "Create an attachment",
+ "createdOn" : "Created on",
"createScriptNotification" : "Create the script",
"currentPsw" : "Current password",
"date" : "Date",
@@ -84,9 +89,11 @@ export const LANG_EN = {
"default" : "default",
"defaultAction" : "Default action",
"delete" : "Delete",
+ "deleteAtt" : "Delete the attachment",
"deleteMsg" : "Do you really want to delete this element",
"desactivateAbsence" : "Deactivate absence",
"description" : "Description",
+ "details" : "Details",
"diffusionList" : "Diffusion list",
"diffusionModelCreation" : "Diffusion model creation",
"diffusionModelDeleted" : "Diffusion model deleted",
@@ -95,9 +102,12 @@ export const LANG_EN = {
"diffusionModelUpdated" : "Diffusion model updated",
"diffusionType" : "Diffusion type",
"display" : "display",
+ "displayAtt" : "Display attachments list",
+ "dlAttachment" : "Download the attachment",
"documents" : "document(s)",
"doNothingRedirect" : "Do nothing (Unlink entity)",
"doNotModifyUnlessExpert" : "Do not edit this section unless you know what you are doing. Incorrect settings can cause the application to malfunction !",
+ "draft" : "Draft",
"eachDay" : "Each day",
"eachHour" : "Each hour",
"eachMinute" : "Each minute",
@@ -176,12 +186,16 @@ export const LANG_EN = {
"lastname" : "Lastname",
"life_cycle" : "Life cycle",
"limitDataReached" : "You have reached max display datas (<b>25000 datas</b>), refine your <b>date range</b>",
+ "linkDetails" : "Access to details",
"linkEntityToUserInfo" : "Click on entity of tree to link / unlink to this user",
"linkGroup" : "Link a group",
+ "links" : "Connections",
"linkUser" : "Link a user",
"listTemplatesRolesUpdated" : "Roles updated",
"logout" : "Logout",
"maarchApplication" : "Maarch App",
+ "mail" : "Mail",
+ "mailAttachments" : "incoming mail attachment(s)",
"manageAbsences" : "Manage absences",
"manageSignatures" : "Manage signatures",
"march" : "March",
@@ -231,6 +245,7 @@ export const LANG_EN = {
"notificationUpdated" : "Notification updated",
"notUsed" : "Not used",
"november" : "November",
+ "object" : "Object",
"october" : "October",
"optional" : "Optional",
"others" : "Other(s)",
@@ -260,6 +275,7 @@ export const LANG_EN = {
"processAction" : "Process action(s)",
"processDelay" : "Process delay",
"processDelayDoctype" : "doctype delay is used",
+ "processLimitDate" : "Processing deadline",
"processType" : "Process type",
"pswReseted" : "Password reseted",
"record" : "element(s)",
@@ -300,6 +316,7 @@ export const LANG_EN = {
"signatures" : "Signatures",
"signAdded" : "Sign added",
"signDeleted" : "Sign deleted",
+ "signed" : "Signed",
"signUpdated" : "Sign updated",
"since" : "Since",
"siretCode" : "SIRET code",
@@ -344,6 +361,7 @@ export const LANG_EN = {
"unselectAll" : "Unselect all",
"until" : "Until",
"update" : "Update",
+ "updateAtt" : "Update the attachment",
"updateStatus" : "Document status modification",
"updateStatusInformationsChrono" : "When typing the CHRONO of a document, you will modify its status. The document will be present in the basket depending of the status you have chosen.",
"updateStatusInformationsGed" : "When typing the GED NUMBER of a document, you will modify its status. The document will be present in the basket depending of the status you have chosen.",
@@ -366,7 +384,7 @@ export const LANG_EN = {
"validateAction" : "Validate action(s)",
"value" : "value",
"view" : "View",
- "visa" : "Visa circuit",
+ "visaWorkflow" : "Visa circuit",
"whereClauseAction" : "Where clause condition of action display",
"workingDays" : "Working days",
"yes" : "Yes",
@@ -385,6 +403,7 @@ export const LANG_EN = {
"delay1" : "Reminder period 1 before term (in days)",
"delay2" : "Reminder period 2 after term (in days)",
"processMode" : "Process modes",
+ "progression" : "Progression",
"loadedFile" : "Loaded file",
"generatedFile" : "Generated file",
"destruction" : "Destruction",
diff --git a/apps/maarch_entreprise/js/angular/lang/lang-fr.ts b/apps/maarch_entreprise/js/angular/lang/lang-fr.ts
index 5d8b3613a3b..db8d15d6d06 100755
--- a/apps/maarch_entreprise/js/angular/lang/lang-fr.ts
+++ b/apps/maarch_entreprise/js/angular/lang/lang-fr.ts
@@ -40,6 +40,7 @@ export const LANG_FR = {
"archival" : "Archivage",
"archivalAgency" : "Convention d'archivage",
"archivalAgreement" : "Service d'archive",
+ "arrivalDate" : "Date d'arrivée",
"assignBy" : "Assignée par",
"associatedStatus" : "Statut associé",
"attachment" : "Pièce jointe",
@@ -83,6 +84,7 @@ export const LANG_FR = {
"chooseModel" : "Choisissez un modèle",
"chooseRedirectGroup" : "Choisissez un groupe de remplacement",
"chronoNumber" : "Numéro chrono",
+ "chrono" : "Chrono",
"city" : "Ville",
"clause" : "Clause",
"clauseGroup" : "Périmètre documentaire",
@@ -92,8 +94,11 @@ export const LANG_FR = {
"confirmAction" : "Voulez-vous vraiment effectuer cette action ?",
"conservation" : "Conservation",
"content_management" : "Versionning de document",
+ "contactInfo" : "Fiche contact",
"country" : "Pays",
+ "createAtt" : "Créer une pièce jointe",
"createScriptNotification" : "Créer le script",
+ "createdOn" : "Créé le",
"currentPsw" : "Mot de passe actuel",
"databaseColumn" : "Colonne BDD",
"dataOfMonth" : "Données du mois",
@@ -108,10 +113,12 @@ export const LANG_FR = {
"delay2" : "Délai relance 2 après terme (en jours)",
"delete" : "Supprimer",
"deleteAssignation" : "Supprimer l'assignation",
+ "deleteAtt" : "Supprimer la pièce jointe",
"deleteMsg" : "Voulez-vous vraiment supprimer cet élément ?",
"desactivateAbsence" : "Désactiver l'absence",
"description" : "Description",
"destruction" : "Destruction",
+ "details" : "Détails",
"diffusionList" : "Liste de diffusion",
"diffusionModelCreation" : "Création d'un modèle de diffusion",
"diffusionModelDeleted" : "Modèle de diffusion supprimé",
@@ -120,6 +127,8 @@ export const LANG_FR = {
"diffusionModelUpdated" : "Modèle de diffusion mis à jour",
"diffusionType" : "Type de Modèle",
"display" : "affichage",
+ "displayAtt" : "Afficher la liste des pièces jointes",
+ "dlAttachment" : "Télécharger la pièce jointe",
"doctype" : "Type de document",
"doctypesAdmin" : "Typologie(s) documentaire(s)",
"documents" : "document(s)",
@@ -129,6 +138,7 @@ export const LANG_FR = {
"documentTypeUpdated" : "Type de document mis à jour",
"doNothingRedirect" : "Ne rien faire (dissocier l'entité)",
"doNotModifyUnlessExpert" : "Ne pas modifier cette section à moins de savoir ce que vous faites. Un mauvais paramètrage peut entrainer des dysfonctionnements de l'application!",
+ "draft" : "Brouillon",
"durationCurrentUse" : "Durée d'utilité courante (en j)",
"eachDay" : "Chaque jour",
"eachHour" : "Toutes les heures",
@@ -228,13 +238,17 @@ export const LANG_FR = {
"lastname" : "Nom",
"life_cycle" : "Cycle de vie",
"limitDataReached" : "Vous avez atteint la limite d'affichage (<b>25000 entrées</b>), veuillez affiner votre <b>plage de dates</b>",
+ "linkDetails" : "Accédez à la fiche détaillée",
"linkEntityToUserInfo" : "Cliquez sur une entité de l'arborescence pour l'associer / dissocier à l'utilisateur",
"linkGroup" : "Associer un groupe",
+ "links" : "Liaisons",
"linkUser" : "Associer un utilisateur",
"listTemplatesRolesUpdated" : "Rôles modifiés",
"loadedFile" : "Fichier importé",
"logout" : "Se déconnecter",
"maarchApplication" : "Application Maarch",
+ "mail" : "Courrier",
+ "mailAttachments" : "pièce(s) complémentaire(s)",
"manageAbsences" : "Rediriger mes bannettes",
"manageSignatures" : "Gérer les signatures",
"mandatory" : "Obligatoire",
@@ -271,7 +285,7 @@ export const LANG_FR = {
"noRecord" : "Aucun élément",
"noReplacement" : "Aucun remplacement",
"noResult" : "Aucun résultat",
- "notes" : "Annotations",
+ "notes" : "Notes",
"notificationAdded" : "Notification ajoutée",
"notificationCreation" : "Création d'une notification",
"notificationDeleted" : "Notification supprimée",
@@ -292,6 +306,7 @@ export const LANG_FR = {
"noUserReplacement" : "Aucun utilisateur de remplacement",
"november" : "Novembre",
"numericPackageImported" : "Pli numérique correctement importé",
+ "object" : "Objet",
"october" : "Octobre",
"optional" : "Optionnel",
"otherActions" : "Action(s) supplémentaire(s)",
@@ -326,7 +341,9 @@ export const LANG_FR = {
"processDelay" : "Délai de traitement",
"processDelayDay" : "Délai de traitement (en jours)",
"processDelayDoctype" : "utilise le délai selon le type de document",
+ "processLimitDate" : "Date limite de traitement",
"processMode" : "Mode de traitement",
+ "progression" : "Avancement",
"processType" : "Type de traitement",
"pswReseted" : "Mot de passe réinitialisé",
"reaffectUserRedirect" : "Réaffecter à l'utilisateur (liste de diffusion + modèle de l'entité)",
@@ -382,6 +399,7 @@ export const LANG_FR = {
"signatureUpdated" : "Signature mise à jour",
"signDeleted" : "Signature supprimée",
"signUpdated" : "Signature modifiée",
+ "signed" : "Signé",
"since" : "Depuis",
"siretCode" : "Numéro SIRET",
"status" : "Statut",
@@ -429,6 +447,7 @@ export const LANG_FR = {
"unselectAll" : "Tout désélectionner",
"until" : "Jusqu'Ã ",
"update" : "Modifier",
+ "updateAtt" : "Modifier la pièce jointe",
"updateStatus" : "Changement de statut de courrier",
"updateStatusInformationsChrono" : "En saisissant le NUMÉRO CHRONO du document, vous modifierez le statut du courrier. Le courrier sera disponible dans la bannette des utilisateurs auquel il était affecté suivant le statut que vous aurez défini.",
"updateStatusInformationsGed" : "En saisissant l'IDENTIFIANT GED du document, vous modifierez le statut du courrier. Le courrier sera disponible dans la bannette des utilisateurs auquel il était affecté suivant le statut que vous aurez défini.",
@@ -452,7 +471,7 @@ export const LANG_FR = {
"validateAction" : "Action(s) de qualification",
"value" : "valeur",
"view" : "Consulter",
- "visa" : "Circuit de visa",
+ "visaWorkflow" : "Circuit de visa",
"webserviceAccount" : "Compte de webservice",
"webserviceAccountDesc" : "Si activé, ce compte ne pourra pas être utilisé pour se connecter graphiquement à l'application.",
"wednesday" : "Mercredi",
diff --git a/src/core/lang/lang-en.php b/src/core/lang/lang-en.php
index 4ad06034950..582208e34b5 100644
--- a/src/core/lang/lang-en.php
+++ b/src/core/lang/lang-en.php
@@ -367,3 +367,17 @@ define('_MAIL_TYPOLOGY_REPORT', 'Mails typology by period');
define('_MAIL_TYPOLOGY_REPORT_DESC', 'Mails typology by period');
define('_MAIL_VOL_BY_CAT_REPORT', 'Mails volume by category, by period');
define('_MAIL_VOL_BY_CAT_REPORT_DESC', 'Mails volume by category, by period');
+
+//ATTACHMENT TYPES
+define( "_RESPONSE_PROJECT", "Response project");
+define( "_SIGNED_RESPONSE", "Signed response");
+define( "_OUTGOING_MAIL_SIGNED", "Signed start date");
+define( "_A_PJ", "Attachment");
+define( "_INCOMING_PJ", "Incoming attachment");
+define( "_WAYBILL", "Mailing slip");
+define( "_ROUTING", "Flow slip");
+define( "_OUTGOING_MAIL", "Spontaneous start mail");
+define( "_CONVERTED_PDF", "Converted PDF by the solution");
+define('_PRINT_FOLDER', 'Folder');
+define('_SVA', 'SVA');
+define('_SVR', 'SVR');
\ No newline at end of file
diff --git a/src/core/lang/lang-fr.php b/src/core/lang/lang-fr.php
index a6653d5f8b7..6dcb762f92b 100644
--- a/src/core/lang/lang-fr.php
+++ b/src/core/lang/lang-fr.php
@@ -366,3 +366,17 @@ define('_MAIL_TYPOLOGY_REPORT', 'Volume de courriers par typologie');
define('_MAIL_TYPOLOGY_REPORT_DESC', 'Permet d\'afficher le nombre de courriers enregistrés par type de document.');
define('_MAIL_VOL_BY_CAT_REPORT', 'Volume de courriers par catégorie');
define('_MAIL_VOL_BY_CAT_REPORT_DESC', 'Permet d\'afficher le nombre de courriers enregistrés par catégorie (arrivé, départ, etc.).');
+
+//ATTACHMENT TYPES
+define( "_RESPONSE_PROJECT", "Projet de réponse");
+define( "_SIGNED_RESPONSE", "Réponse signée");
+define( "_OUTGOING_MAIL_SIGNED", "Courrier départ signé");
+define( "_A_PJ", "Pièce jointe");
+define( "_INCOMING_PJ", "Pièce jointe capturée");
+define( "_WAYBILL", "Bordereau d'envoi");
+define( "_ROUTING", "Fiche de circulation");
+define( "_OUTGOING_MAIL", "Courrier départ spontané");
+define( "_CONVERTED_PDF", "PDF converti par la solution");
+define('_PRINT_FOLDER', 'Dossier');
+define('_SVA', 'SVA');
+define('_SVR', 'SVR');
\ No newline at end of file
--
GitLab