From f3ebeb841aed74c48f54d04bc1ac0b68fe69e041 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adina=20=C8=9Aeudan?= <adina@devplant.ro>
Date: Thu, 22 Jul 2021 14:07:38 +0300
Subject: [PATCH] Translation rework: fixes

---
 .../add-edit-dictionary-dialog.component.ts   |  7 ++--
 ...edit-dossier-attribute-dialog.component.ts |  3 +-
 .../license-information-screen.component.ts   |  3 +-
 ...gn-reviewer-approver-dialog.component.html | 14 +++++---
 .../red-ui/src/app/state/app-state.service.ts |  3 +-
 .../annotation-types-translations.ts          |  2 +-
 apps/red-ui/src/assets/i18n/en.json           | 16 +++-------
 apps/red-ui/src/assets/i18n/te.json           | 32 +++++++++++++------
 8 files changed, 47 insertions(+), 33 deletions(-)

diff --git a/apps/red-ui/src/app/modules/admin/dialogs/add-edit-dictionary-dialog/add-edit-dictionary-dialog.component.ts b/apps/red-ui/src/app/modules/admin/dialogs/add-edit-dictionary-dialog/add-edit-dictionary-dialog.component.ts
index 592e389ae..75577153c 100644
--- a/apps/red-ui/src/app/modules/admin/dialogs/add-edit-dictionary-dialog/add-edit-dictionary-dialog.component.ts
+++ b/apps/red-ui/src/app/modules/admin/dialogs/add-edit-dictionary-dialog/add-edit-dictionary-dialog.component.ts
@@ -7,6 +7,7 @@ import { Toaster } from '@services/toaster.service';
 import { TranslateService } from '@ngx-translate/core';
 import { TypeValueWrapper } from '@models/file/type-value.wrapper';
 import { humanize } from '../../../../utils/functions';
+import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker';
 
 @Component({
     selector: 'redaction-add-edit-dictionary-dialog',
@@ -89,11 +90,11 @@ export class AddEditDictionaryDialogComponent {
             () => this._dialogRef.close(true),
             error => {
                 if (error.status === 409) {
-                    this._toaster.error('add-edit-dictionary.error.dictionary-already-exists');
+                    this._toaster.error(_('add-edit-dictionary.error.dictionary-already-exists'));
                 } else if (error.status === 400) {
-                    this._toaster.error('add-edit-dictionary.error.invalid-color-or-rank');
+                    this._toaster.error(_('add-edit-dictionary.error.invalid-color-or-rank'));
                 } else {
-                    this._toaster.error('add-edit-dictionary.error.generic');
+                    this._toaster.error(_('add-edit-dictionary.error.generic'));
                 }
             }
         );
diff --git a/apps/red-ui/src/app/modules/admin/dialogs/add-edit-dossier-attribute-dialog/add-edit-dossier-attribute-dialog.component.ts b/apps/red-ui/src/app/modules/admin/dialogs/add-edit-dossier-attribute-dialog/add-edit-dossier-attribute-dialog.component.ts
index 5a35385c2..73a61f3a2 100644
--- a/apps/red-ui/src/app/modules/admin/dialogs/add-edit-dossier-attribute-dialog/add-edit-dossier-attribute-dialog.component.ts
+++ b/apps/red-ui/src/app/modules/admin/dialogs/add-edit-dossier-attribute-dialog/add-edit-dossier-attribute-dialog.component.ts
@@ -9,6 +9,7 @@ import { Toaster } from '@services/toaster.service';
 import { AutoUnsubscribeComponent } from '@shared/base/auto-unsubscribe.component';
 import { DossierAttributesService } from '@shared/services/controller-wrappers/dossier-attributes.service';
 import { dossierAttributeTypesTranslations } from '../../translations/dossier-attribute-types-translations';
+import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker';
 
 @Component({
     selector: 'redaction-add-edit-dossier-attribute-dialog',
@@ -80,7 +81,7 @@ export class AddEditDossierAttributeDialogComponent extends AutoUnsubscribeCompo
             },
             (error: HttpErrorResponse) => {
                 this._loadingService.stop();
-                this._toaster.error('add-edit-dossier-attribute.error.generic', { error: error });
+                this._toaster.error(_('add-edit-dossier-attribute.error.generic'), { error: error });
             }
         );
     }
diff --git a/apps/red-ui/src/app/modules/admin/screens/license-information/license-information-screen.component.ts b/apps/red-ui/src/app/modules/admin/screens/license-information/license-information-screen.component.ts
index 4b7b7d12d..a9f9c95fa 100644
--- a/apps/red-ui/src/app/modules/admin/screens/license-information/license-information-screen.component.ts
+++ b/apps/red-ui/src/app/modules/admin/screens/license-information/license-information-screen.component.ts
@@ -93,6 +93,7 @@ export class LicenseInformationScreenComponent implements OnInit {
         const subject = this._translateService.instant('license-info-screen.email.title', {
             licenseCustomer
         });
+        const lineBreak = '%0D%0A';
         const body = [
             this._translateService.instant('license-info-screen.email.body.analyzed', {
                 pages: this.currentInfo.numberOfAnalyzedPages
@@ -100,7 +101,7 @@ export class LicenseInformationScreenComponent implements OnInit {
             this._translateService.instant('license-info-screen.email.body.licensed', {
                 pages: this.totalLicensedNumberOfPages
             })
-        ].join('%0D%0A');
+        ].join(lineBreak);
         window.location.href = `mailto:${this.appConfigService.getConfig('LICENSE_EMAIL')}?subject=${subject}&body=${body}`;
     }
 
diff --git a/apps/red-ui/src/app/modules/dossier/dialogs/assign-reviewer-approver-dialog/assign-reviewer-approver-dialog.component.html b/apps/red-ui/src/app/modules/dossier/dialogs/assign-reviewer-approver-dialog/assign-reviewer-approver-dialog.component.html
index 86e23df90..0f73f7b3a 100644
--- a/apps/red-ui/src/app/modules/dossier/dialogs/assign-reviewer-approver-dialog/assign-reviewer-approver-dialog.component.html
+++ b/apps/red-ui/src/app/modules/dossier/dialogs/assign-reviewer-approver-dialog/assign-reviewer-approver-dialog.component.html
@@ -1,11 +1,17 @@
 <section class="dialog">
-    <div [translate]="'assign-' + data.mode + '-owner.dialog.title'" class="dialog-header heading-l"></div>
+    <div
+        [translateParams]="{
+            type: data.mode
+        }"
+        [translate]="'assign-owner.dialog.title'"
+        class="dialog-header heading-l"
+    ></div>
 
     <form (submit)="saveUsers()" [formGroup]="usersForm">
         <div class="dialog-content">
             <div class="red-input-group w-300 required">
                 <mat-form-field floatLabel="always">
-                    <mat-label>{{ 'assign-' + data.mode + '-owner.dialog.single-user' | translate }}</mat-label>
+                    <mat-label>{{ 'assign-owner.dialog.label' | translate: { type: data.mode } }}</mat-label>
                     <mat-select formControlName="singleUser">
                         <mat-option *ngFor="let userId of singleUsersSelectOptions" [value]="userId">
                             {{ userService.getNameForId(userId) }}
@@ -17,10 +23,10 @@
 
         <div class="dialog-actions">
             <button [disabled]="!usersForm.valid || !changed" color="primary" mat-flat-button type="submit">
-                {{ 'assign-' + data.mode + '-owner.dialog.save' | translate }}
+                {{ 'assign-owner.dialog.save' | translate }}
             </button>
 
-            <div [translate]="'assign-' + data.mode + '-owner.dialog.cancel'" class="all-caps-label pointer cancel" mat-dialog-close></div>
+            <div [translate]="'assign-owner.dialog.cancel'" class="all-caps-label pointer cancel" mat-dialog-close></div>
         </div>
     </form>
 
diff --git a/apps/red-ui/src/app/state/app-state.service.ts b/apps/red-ui/src/app/state/app-state.service.ts
index 22486ceb1..fa2139c6b 100644
--- a/apps/red-ui/src/app/state/app-state.service.ts
+++ b/apps/red-ui/src/app/state/app-state.service.ts
@@ -21,6 +21,7 @@ import { DossierWrapper } from './model/dossier.wrapper';
 import { TypeValueWrapper } from '@models/file/type-value.wrapper';
 import { DossierTemplateModelWrapper } from '@models/file/dossier-template-model.wrapper';
 import { DossiersService } from '../modules/dossier/services/dossiers.service';
+import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker';
 
 export interface AppState {
     dossiers: DossierWrapper[];
@@ -348,7 +349,7 @@ export class AppStateService {
             return foundDossier;
         } catch (error) {
             this._toaster.error(
-                error.status === 409 ? 'add-dossier-dialog.errors.dossier-already-exists' : 'add-dossier-dialog.errors.generic'
+                error.status === 409 ? _('add-dossier-dialog.errors.dossier-already-exists') : _('add-dossier-dialog.errors.generic')
             );
         }
     }
diff --git a/apps/red-ui/src/app/translations/annotation-types-translations.ts b/apps/red-ui/src/app/translations/annotation-types-translations.ts
index e1917b831..08c363279 100644
--- a/apps/red-ui/src/app/translations/annotation-types-translations.ts
+++ b/apps/red-ui/src/app/translations/annotation-types-translations.ts
@@ -19,5 +19,5 @@ export const annotationTypesTranslations: { [key in AnnotationSuperType]: string
     'suggestion-recategorize-image': _('annotation-type.suggestion-recategorize-image'),
     'suggestion-force-redaction': _('annotation-type.suggestion-force-redaction'),
     'suggestion-remove': _('annotation-type.suggestion-remove'),
-    'suggestion-remove-dictionary': _('suggestion-remove-dictionary')
+    'suggestion-remove-dictionary': _('annotation-type.suggestion-remove-dictionary')
 };
diff --git a/apps/red-ui/src/assets/i18n/en.json b/apps/red-ui/src/assets/i18n/en.json
index 4987f501d..3319b987e 100644
--- a/apps/red-ui/src/assets/i18n/en.json
+++ b/apps/red-ui/src/assets/i18n/en.json
@@ -112,7 +112,7 @@
       "label": "Accept Recommendation"
     },
     "accept-suggestion": {
-      "add-to-dict": "Approve and add to dictionary"
+      "label": "Approve and add to dictionary"
     },
     "edit-reason": {
       "label": "Edit Reason"
@@ -236,14 +236,6 @@
   "app-name": "DDA-R",
   "APPROVED": "Approved",
   "archived": "Archived",
-  "assign-approver-owner": {
-    "dialog": {
-      "cancel": "Cancel",
-      "save": "Save",
-      "single-user": "Approver",
-      "title": "Manage File Approver"
-    }
-  },
   "assign-dossier-owner": {
     "dialog": {
       "approvers": "Approvers",
@@ -258,12 +250,12 @@
       "title": "Manage Dossier Team"
     }
   },
-  "assign-reviewer-owner": {
+  "assign-owner": {
     "dialog": {
       "cancel": "Cancel",
+      "label": "{type, select, approver{Approver} reviewer{Reviewer} other{}}",
       "save": "Save",
-      "single-user": "Reviewer",
-      "title": "Manage File Reviewer"
+      "title": "Manage File {type, select, approver{Approver} reviewer{Reviewer} other{}}"
     }
   },
   "assign-user": {
diff --git a/apps/red-ui/src/assets/i18n/te.json b/apps/red-ui/src/assets/i18n/te.json
index 9726570cc..b9cbf4cad 100644
--- a/apps/red-ui/src/assets/i18n/te.json
+++ b/apps/red-ui/src/assets/i18n/te.json
@@ -1,12 +1,5 @@
 {
-  "%0D%0A": "",
   ", ": "",
-  "-owner": {
-    "dialog": {
-      "cancel": "",
-      "title": ""
-    }
-  },
   "actions": {
     "all": "",
     "none": ""
@@ -16,6 +9,10 @@
       "save": "",
       "save-and-add-members": ""
     },
+    "errors": {
+      "dossier-already-exists": "",
+      "generic": ""
+    },
     "form": {
       "description": {
         "label": "",
@@ -32,6 +29,11 @@
     "header-new": ""
   },
   "add-edit-dictionary": {
+    "error": {
+      "dictionary-already-exists": "",
+      "generic": "",
+      "invalid-color-or-rank": ""
+    },
     "form": {
       "add-to-dictionary-action": "",
       "case-sensitive": "",
@@ -51,6 +53,9 @@
     "title": ""
   },
   "add-edit-dossier-attribute": {
+    "error": {
+      "generic": ""
+    },
     "form": {
       "label": "",
       "label-placeholder": "",
@@ -221,10 +226,10 @@
     "suggestion-change-legal-basis": "",
     "suggestion-force-redaction": "",
     "suggestion-recategorize-image": "",
-    "suggestion-remove": ""
+    "suggestion-remove": "",
+    "suggestion-remove-dictionary": ""
   },
   "annotations": "",
-  "assign-": "",
   "assign-dossier-owner": {
     "dialog": {
       "approvers": "",
@@ -236,6 +241,14 @@
       "single-user": ""
     }
   },
+  "assign-owner": {
+    "dialog": {
+      "cancel": "",
+      "label": "",
+      "save": "",
+      "title": ""
+    }
+  },
   "assign-user": {
     "cancel": "",
     "save": ""
@@ -1074,7 +1087,6 @@
     "subtitle": "",
     "title": ""
   },
-  "suggestion-remove-dictionary": "",
   "top-bar": {
     "navigation-items": {
       "back": "",