From 06dadddc2b0acad6737d70db20172c257cc37ece Mon Sep 17 00:00:00 2001
From: Damien <damien.burel@maarch.org>
Date: Tue, 21 Apr 2020 17:34:26 +0200
Subject: [PATCH] FEAT #13441 TIME 0:40 Fix indexing model lang + lang

---
 .../indexingModel/controllers/IndexingModelController.php   | 2 +-
 .../indexing-models-administration.component.ts             | 6 +-----
 .../template/template-administration.component.ts           | 2 +-
 src/frontend/lang/lang-en.ts                                | 1 +
 src/frontend/lang/lang-fr.ts                                | 1 +
 src/frontend/lang/lang-nl.ts                                | 1 +
 6 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/app/indexingModel/controllers/IndexingModelController.php b/src/app/indexingModel/controllers/IndexingModelController.php
index c522bfa552e..3f493ef22d4 100755
--- a/src/app/indexingModel/controllers/IndexingModelController.php
+++ b/src/app/indexingModel/controllers/IndexingModelController.php
@@ -396,7 +396,7 @@ class IndexingModelController
         ]);
 
         if (!empty($resources)) {
-            return $response->withStatus(400)->withJson(['errors' => 'Model is used by at least one resource']);
+            return $response->withStatus(400)->withJson(['errors' => 'Model is used by at least one resource', 'lang' => 'modelUsedByResources']);
         }
 
         $childrenModels = IndexingModelModel::get(['select' => ['id', 'label'], 'where' => ['"master" = ?'], 'data' => [$args['id']]]);
diff --git a/src/frontend/app/administration/indexingModel/indexing-models-administration.component.ts b/src/frontend/app/administration/indexingModel/indexing-models-administration.component.ts
index 4243dcb846d..cf6ef892477 100644
--- a/src/frontend/app/administration/indexingModel/indexing-models-administration.component.ts
+++ b/src/frontend/app/administration/indexingModel/indexing-models-administration.component.ts
@@ -109,11 +109,7 @@ export class IndexingModelsAdministrationComponent implements OnInit {
                     this.notify.success(this.lang.indexingModelDeleted);
                 }),
                 catchError((err: any) => {
-                    if (err.error.errors === 'Model is used by at least one resource') {
-                        this.notify.error(this.lang.modelUsedByResources);
-                    } else {
-                        this.notify.handleSoftErrors(err);
-                    }
+                    this.notify.handleSoftErrors(err);
                     return of(false);
                 })
             ).subscribe();
diff --git a/src/frontend/app/administration/template/template-administration.component.ts b/src/frontend/app/administration/template/template-administration.component.ts
index c6b67de41dc..e60df48ac7e 100755
--- a/src/frontend/app/administration/template/template-administration.component.ts
+++ b/src/frontend/app/administration/template/template-administration.component.ts
@@ -386,7 +386,7 @@ export class TemplateAdministrationComponent implements OnInit, OnDestroy {
                     }
                 }
                 if (this.functionsService.empty(editorOptions.objectId)) {
-                    alert('Vous ne pouvez pas éditer avec l\'applet Java un document importé.');
+                    alert(this.lang.canNotEditImportedDocumentWhenJava);
                     return false;
                 }
             } else {
diff --git a/src/frontend/lang/lang-en.ts b/src/frontend/lang/lang-en.ts
index 3841a5f0673..18e877ca135 100755
--- a/src/frontend/lang/lang-en.ts
+++ b/src/frontend/lang/lang-en.ts
@@ -538,6 +538,7 @@ export const LANG_EN = {
     "doctype":                                     "Document type",
     "doctypes":                                    "Document types",
     "documentEditor":                              "Document editor",
+    "canNotEditImportedDocumentWhenJava":          "You can not edit imported document with Java applet",
     "documentEditor_java":                         "Open your default document editor in a new window",
     "documentEditor_onlyoffice":                   "Open OnlyOffice directly inside Maarch Courrier",
     "documentOutOfPerimeter":                      "This document is out of your perimeter",
diff --git a/src/frontend/lang/lang-fr.ts b/src/frontend/lang/lang-fr.ts
index a241748ab0d..44511215d4d 100755
--- a/src/frontend/lang/lang-fr.ts
+++ b/src/frontend/lang/lang-fr.ts
@@ -538,6 +538,7 @@ export const LANG_FR = {
     "doctype":                                     "Type de courrier",
     "doctypes":                                    "Types de courriers",
     "documentEditor":                              "Editeur de document",
+    "canNotEditImportedDocumentWhenJava":          "Vous ne pouvez pas éditer un document importé avec l'applet Java",
     "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",
     "documentOutOfPerimeter":                      "Ce document est en dehors de votre périmètre",
diff --git a/src/frontend/lang/lang-nl.ts b/src/frontend/lang/lang-nl.ts
index 13c9289d479..9e9e0708453 100755
--- a/src/frontend/lang/lang-nl.ts
+++ b/src/frontend/lang/lang-nl.ts
@@ -1378,6 +1378,7 @@ export const LANG_NL = {
     "editorOption": "Editor option", //_TO_TRANSLATE
     "editorOptionAdmin": "Manage editor option", //_TO_TRANSLATE
     "documentEditor": "Document editor", //_TO_TRANSLATE
+    "canNotEditImportedDocumentWhenJava":          "You can not edit imported document with Java applet", //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
-- 
GitLab