From 5b9cb4c480fe2dfdef16a0125a0a4b642adf62b5 Mon Sep 17 00:00:00 2001 From: "florian.azizian" <florian.azizian@maarch.org> Date: Fri, 24 Jan 2020 16:13:03 +0100 Subject: [PATCH] FEAT #10633 TIME 0:15 wording reset visa workflow --- .../visa-reset-action/reset-visa-action.component.html | 4 +--- src/frontend/lang/lang-en.ts | 3 +-- src/frontend/lang/lang-fr.ts | 3 +-- src/frontend/lang/lang-nl.ts | 3 +-- 4 files changed, 4 insertions(+), 9 deletions(-) diff --git a/src/frontend/app/actions/visa-reset-action/reset-visa-action.component.html b/src/frontend/app/actions/visa-reset-action/reset-visa-action.component.html index fef6bfd807f..bc0edc7c6ba 100644 --- a/src/frontend/app/actions/visa-reset-action/reset-visa-action.component.html +++ b/src/frontend/app/actions/visa-reset-action/reset-visa-action.component.html @@ -9,9 +9,7 @@ <b *ngIf="data.resIds.length === 1" color="primary" class="highlight">{{data.resource.chrono}}</b> <b *ngIf="data.resIds.length > 1" color="primary" class="highlight">{{data.resIds.length}} {{lang.elements}}</b> ? - <div *ngIf="data.resIds.length == 1 && appVisaWorkflow !== undefined && appVisaWorkflow.getFirstVisaUser() !== ''" class="alert-message alert-message-info" role="alert" style="margin-top: 30px;" - [innerHTML]="lang.resetVisaWorkflowUser + ' <b>' + appVisaWorkflow.getFirstVisaUser().labelToDisplay + '</b>'"></div> - <div *ngIf="data.resIds.length > 1" class="alert-message alert-message-info" role="alert" style="margin-top: 30px;" + <div *ngIf="data.resIds.length > 0" class="alert-message alert-message-info" role="alert" style="margin-top: 30px;" [innerHTML]="lang.resetVisaWorkflow"></div> <div *ngIf="resourcesErrors.length > 0" class="alert-message alert-message-danger mailList" role="alert"> diff --git a/src/frontend/lang/lang-en.ts b/src/frontend/lang/lang-en.ts index 92a78e24763..8bd27ebe3f1 100755 --- a/src/frontend/lang/lang-en.ts +++ b/src/frontend/lang/lang-en.ts @@ -1408,8 +1408,7 @@ export const LANG_EN = { "closeFullscreen" : "Disable fullscreen", "hasNoEntity": "Those mails do not have initiator entity", "destUserSetToDefault": "Assignee will be the assignee of the initiator entity template list", - "resetVisaWorkflow": "The workflow will be <b>reset</b>, this circuit will be reset to first assignee", - "resetVisaWorkflowUser": "The workflow will be <b>reset</b>, this circuit will be reset to", + "resetVisaWorkflow": "The workflow actions will be <b>reset</b>", "interruptVisaWorkflow": "The following users will not be able to target mail", "rejectVisaBack": "Document will be send to the previous user", "rejectVisaBackUser": "Document will be send back to", diff --git a/src/frontend/lang/lang-fr.ts b/src/frontend/lang/lang-fr.ts index a129a815713..d1a7ee4ddba 100755 --- a/src/frontend/lang/lang-fr.ts +++ b/src/frontend/lang/lang-fr.ts @@ -1448,8 +1448,7 @@ export const LANG_FR = { "closeFullscreen" : "Désactiver le mode plein écran", "hasNoEntity": "Les courriers suivants n'ont pas d'entité initiatrice", "destUserSetToDefault": "L'attributaire sera celui de la liste de diffusion de l'entité initiatrice", - "resetVisaWorkflow": "Le circuit va être <b>réinitialisé</b>, le circuit recommencera à partir du premier viseur", - "resetVisaWorkflowUser": "Le circuit va être <b>réinitialisé</b>, le circuit recommencera à partir de", + "resetVisaWorkflow": "Les actions du circuit de visa seront <b>réinitialisées</b>", "interruptVisaWorkflow": "Les utilisateurs suivants ne pourront pas viser le courrier", "rejectVisaBack": "Le courrier sera envoyé à la dernière personne ayant visé", "rejectVisaBackUser": "Le courrier retournera à ", diff --git a/src/frontend/lang/lang-nl.ts b/src/frontend/lang/lang-nl.ts index 8343c18e79f..731b0873f91 100755 --- a/src/frontend/lang/lang-nl.ts +++ b/src/frontend/lang/lang-nl.ts @@ -1431,8 +1431,7 @@ export const LANG_NL = { "closeFullscreen" : "Disable fullscreen", //_TO_TRANSLATE "hasNoEntity": "Those mails do not have initiator entity", //_TO_TRANSLATE "destUserSetToDefault": "Assignee will be the assignee of the initiator entity template list", //_TO_TRANSLATE - "resetVisaWorkflow": "The workflow will be <b>reset</b>, this circuit will be reset to first assignee", //_TO_TRANSLATE - "resetVisaWorkflowUser": "The workflow will be <b>reset</b>, this circuit will be reset to", //_TO_TRANSLATE + "resetVisaWorkflow": "The workflow actions will be <b>reset</b>", //_TO_TRANSLATE "interruptVisaWorkflow": "The following users will not be able to target mail", //_TO_TRANSLATE "rejectVisaBack": "Document will be send to the previous user", //_TO_TRANSLATE "rejectVisaBackUser": "Document will be send back to", //_TO_TRANSLATE -- GitLab