From c294c13ef52fb71ef0b8e2dac88b4d83bd8f33d7 Mon Sep 17 00:00:00 2001
From: "hamza.hramchi" <hamza.hramchi@xelians.fr>
Date: Fri, 27 Nov 2020 16:39:57 +0100
Subject: [PATCH] FEAT #15546 TIME 0:25 fix : css + generateMissingLang
function
---
src/frontend/app/service/debug/dev-lang.component.ts | 6 ++----
src/frontend/app/service/debug/dev-tool.component.ts | 2 +-
2 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/src/frontend/app/service/debug/dev-lang.component.ts b/src/frontend/app/service/debug/dev-lang.component.ts
index b3b678984a..bcc9c53504 100644
--- a/src/frontend/app/service/debug/dev-lang.component.ts
+++ b/src/frontend/app/service/debug/dev-lang.component.ts
@@ -60,11 +60,10 @@ export class DevLangComponent implements OnInit {
this.currentLang = ev.detail.value;
}
- generateMissingLang(ignoreToTranslate = false) {
+ generateMissingLang(ignoreToTranslate: boolean) {
let newLang = {};
let mergedLang = this.allLang[this.currentLang];
const regex = /__TO_TRANSLATE$/g;
-
this.missingLang[this.currentLang].forEach((element: any) => {
if (element.value.match(regex) === null && ignoreToTranslate) {
newLang[element.id] = element.value;
@@ -72,8 +71,7 @@ export class DevLangComponent implements OnInit {
newLang[element.id] = element.value;
}
});
- mergedLang = { ...mergedLang, ...newLang };
-
+ mergedLang.lang = {...mergedLang.lang, ...newLang};
this.http.put('../rest/languages', { langId: this.currentLang, jsonContent: mergedLang }).pipe(
tap((data: any) => {
Object.keys(newLang).forEach(keyLang => {
diff --git a/src/frontend/app/service/debug/dev-tool.component.ts b/src/frontend/app/service/debug/dev-tool.component.ts
index fc5b80d57e..6d196bf97a 100644
--- a/src/frontend/app/service/debug/dev-tool.component.ts
+++ b/src/frontend/app/service/debug/dev-tool.component.ts
@@ -31,7 +31,7 @@ export class DevToolComponent implements OnInit {
openLangTool() {
const dialogRef = this.dialog.open(DevLangComponent, {
panelClass: 'maarch-modal',
- height: '99%',
+ height: '80%',
width: '80%',
data: {
countMissingLang : this.countMissingLang
--
GitLab