From 7ef72690bba2782df1a48e11d1f206f47866b930 Mon Sep 17 00:00:00 2001 From: "florian.azizian" <florian.azizian@maarch.org> Date: Fri, 27 Dec 2019 10:54:26 +0100 Subject: [PATCH] FEAT #11158 TIME 0:40 display document editor description --- src/frontend/app/profile.component.html | 3 ++- src/frontend/lang/lang-en.ts | 2 ++ src/frontend/lang/lang-fr.ts | 2 ++ src/frontend/lang/lang-nl.ts | 2 ++ 4 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/frontend/app/profile.component.html b/src/frontend/app/profile.component.html index 15ef28e164c..f695855ceac 100755 --- a/src/frontend/app/profile.component.html +++ b/src/frontend/app/profile.component.html @@ -174,12 +174,13 @@ <div style="display:flex; margin-left: 30px"> <div style="display:flex; align-items: center;">{{lang.documentEditor}}</div> - <div class="col-sm-2" style="display:flex; margin-left: 15px"> + <div class="col-sm-3" style="display:flex; margin-left: 15px"> <mat-form-field> <mat-select name="documentEdition" [(ngModel)]="user.preferences.documentEdition" (selectionChange)="updateUserPreferences();"> <mat-option *ngFor='let editor of editorsList' [value]="editor">{{editor}}</mat-option> </mat-select> + <mat-hint>{{lang['documentEditor_' + user.preferences.documentEdition]}}</mat-hint> </mat-form-field> </div> </div> diff --git a/src/frontend/lang/lang-en.ts b/src/frontend/lang/lang-en.ts index 7322cdb0111..083ec96ada0 100755 --- a/src/frontend/lang/lang-en.ts +++ b/src/frontend/lang/lang-en.ts @@ -1337,6 +1337,8 @@ export const LANG_EN = { "editorOption": "Editor option", "editorOptionAdmin": "Manage editor option", "documentEditor": "Document editor", + "documentEditor_java": "Open your defaut document editor in a new windows", + "documentEditor_onlyoffice": "Open OnlyOffice inside Maarch Courrier application", "contactsList": "Contacts list", "listConfiguration": "Manage list display", "noticeGroupeOrder": "Drag and drop group to set order", diff --git a/src/frontend/lang/lang-fr.ts b/src/frontend/lang/lang-fr.ts index 386ba086c63..ced357d5580 100755 --- a/src/frontend/lang/lang-fr.ts +++ b/src/frontend/lang/lang-fr.ts @@ -1375,6 +1375,8 @@ export const LANG_FR = { "editorOption": "Option d'édition", "editorOptionAdmin": "Gérer les paramètres d'édition", "documentEditor": "Editeur de document", + "documentEditor_java": "Ouvre votre éditeur de document par défaut dans une nouvelle fenêtre", + "documentEditor_onlyoffice": "Ouvre la suite OnlyOffice directement dans l'application Maarch Courrier", "contactsList": "Liste des contacts", "listConfiguration": "Paramétrer l'affichage de la liste", "noticeGroupeOrder": "Glisser-déposer les groupes pour définir l'ordre", diff --git a/src/frontend/lang/lang-nl.ts b/src/frontend/lang/lang-nl.ts index 0ae071568ec..cccaff49c69 100755 --- a/src/frontend/lang/lang-nl.ts +++ b/src/frontend/lang/lang-nl.ts @@ -1362,6 +1362,8 @@ export const LANG_NL = { "editorOption": "Editor option", //_TO_TRANSLATE "editorOptionAdmin": "Manage editor option", //_TO_TRANSLATE "documentEditor": "Document editor", //_TO_TRANSLATE + "documentEditor_java": "Open your defaut document editor in a new windows", //_TO_TRANSLATE + "documentEditor_onlyoffice": "Open OnlyOffice inside Maarch Courrier application", //_TO_TRANSLATE "contactsList": "Contacts list", //_TO_TRANSLATE "listConfiguration": "Manage list display", //_TO_TRANSLATE "noticeGroupeOrder": "Drag and drop group to set order", //_TO_TRANSLATE -- GitLab