From 4632bde685b7d5e640da7e0de431b9c1a3c22292 Mon Sep 17 00:00:00 2001
From: Timo Bejan <timo.bejan.ext@iqser.com>
Date: Wed, 25 Aug 2021 15:42:20 +0300
Subject: [PATCH] merge

---
 .../team-members-manager.component.ts                |  2 +-
 .../assign-reviewer-approver-dialog.component.ts     |  2 +-
 apps/red-ui/src/assets/i18n/en.json                  | 12 +++++-------
 3 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/apps/red-ui/src/app/modules/dossier/components/team-members-manager/team-members-manager.component.ts b/apps/red-ui/src/app/modules/dossier/components/team-members-manager/team-members-manager.component.ts
index 5a2c45c8e..62cdbb367 100644
--- a/apps/red-ui/src/app/modules/dossier/components/team-members-manager/team-members-manager.component.ts
+++ b/apps/red-ui/src/app/modules/dossier/components/team-members-manager/team-members-manager.component.ts
@@ -5,7 +5,7 @@ import { UserService } from '@services/user.service';
 import { Toaster } from '@iqser/common-ui';
 import { FormBuilder, FormGroup, Validators } from '@angular/forms';
 import { DossierWrapper } from '@state/model/dossier.wrapper';
-import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker/lib/ngx-translate-extract-marker';
+import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker';
 
 @Component({
     selector: 'redaction-team-members-manager',
diff --git a/apps/red-ui/src/app/modules/dossier/dialogs/assign-reviewer-approver-dialog/assign-reviewer-approver-dialog.component.ts b/apps/red-ui/src/app/modules/dossier/dialogs/assign-reviewer-approver-dialog/assign-reviewer-approver-dialog.component.ts
index a235b0fd3..92be25dcd 100644
--- a/apps/red-ui/src/app/modules/dossier/dialogs/assign-reviewer-approver-dialog/assign-reviewer-approver-dialog.component.ts
+++ b/apps/red-ui/src/app/modules/dossier/dialogs/assign-reviewer-approver-dialog/assign-reviewer-approver-dialog.component.ts
@@ -7,7 +7,7 @@ import { Toaster } from '@iqser/common-ui';
 import { FormBuilder, FormGroup, Validators } from '@angular/forms';
 import { FileStatusWrapper } from '@models/file/file-status.wrapper';
 import { DossierWrapper } from '@state/model/dossier.wrapper';
-import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker/lib/ngx-translate-extract-marker';
+import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker';
 
 class DialogData {
     mode: 'approver' | 'reviewer';
diff --git a/apps/red-ui/src/assets/i18n/en.json b/apps/red-ui/src/assets/i18n/en.json
index ce743eb5b..65a3f04dd 100644
--- a/apps/red-ui/src/assets/i18n/en.json
+++ b/apps/red-ui/src/assets/i18n/en.json
@@ -848,7 +848,10 @@
   },
   "error": {
     "generic": "Oops! Something went wrong...",
-    "reload": "Reload"
+    "reload": "Reload",
+    "http": {
+      "generic": "Action failed with code {status}"
+    }
   },
   "exact-date": "{day} {month} {year} at {hour}:{minute}",
   "file": "File",
@@ -1494,10 +1497,5 @@
     },
     "title": "Watermark"
   },
-  "yesterday": "Yesterday",
-  "error": {
-    "http": {
-      "generic": "Action failed with code {status}"
-    }
-  }
+  "yesterday": "Yesterday"
 }