From f8250d926793b3d50f99f69e0677d606b4239a1c Mon Sep 17 00:00:00 2001 From: Timo Bejan Date: Fri, 13 Aug 2021 16:17:10 +0300 Subject: [PATCH] history fix and labels --- apps/red-ui/src/app/services/router-history.service.ts | 6 +++++- apps/red-ui/src/assets/i18n/en.json | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/apps/red-ui/src/app/services/router-history.service.ts b/apps/red-ui/src/app/services/router-history.service.ts index 8ffe2364f..c0ee27d62 100644 --- a/apps/red-ui/src/app/services/router-history.service.ts +++ b/apps/red-ui/src/app/services/router-history.service.ts @@ -17,6 +17,10 @@ export class RouterHistoryService { } navigateToLastDossiersScreen() { - this._router.navigate([this._lastDossiersScreen]); + if (this._router.url === this._lastDossiersScreen) { + this._router.navigate(['/main/dossiers']); + } else { + this._router.navigate([this._lastDossiersScreen]); + } } } diff --git a/apps/red-ui/src/assets/i18n/en.json b/apps/red-ui/src/assets/i18n/en.json index f8963bdb1..9aec49744 100644 --- a/apps/red-ui/src/assets/i18n/en.json +++ b/apps/red-ui/src/assets/i18n/en.json @@ -116,7 +116,7 @@ "label": "Accept Recommendation" }, "accept-suggestion": { - "label": "Approve and add to dictionary" + "label": "Approve Suggestion" }, "edit-reason": { "label": "Edit Reason"