From badc34717fe1bf0611f934c994aa22068935f792 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adina=20=C8=9Aeudan?= <adina@devplant.ro>
Date: Thu, 12 Nov 2020 18:34:35 +0200
Subject: [PATCH] Translations for manual annotation

---
 .../manual-annotation-dialog.component.html   | 12 +--
 .../file/service/manual-annotation.service.ts | 24 +++---
 .../project-overview-screen.component.html    |  2 +-
 apps/red-ui/src/assets/i18n/en.json           | 76 +++++++++++--------
 4 files changed, 63 insertions(+), 51 deletions(-)

diff --git a/apps/red-ui/src/app/dialogs/manual-redaction-dialog/manual-annotation-dialog.component.html b/apps/red-ui/src/app/dialogs/manual-redaction-dialog/manual-annotation-dialog.component.html
index f69402da4..beb85b116 100644
--- a/apps/red-ui/src/app/dialogs/manual-redaction-dialog/manual-annotation-dialog.component.html
+++ b/apps/red-ui/src/app/dialogs/manual-redaction-dialog/manual-annotation-dialog.component.html
@@ -4,12 +4,12 @@
 
         <div class="dialog-content">
             <div class="red-input-group">
-                <label translate="manual-redaction.dialog.content.text"></label>
+                <label translate="manual-annotation.dialog.content.text"></label>
             </div>
             {{ manualRedactionEntryWrapper.manualRedactionEntry.value }}
 
             <div class="red-input-group" *ngIf="!isDictionaryRequest">
-                <label translate="manual-redaction.dialog.content.reason"></label>
+                <label translate="manual-annotation.dialog.content.reason"></label>
                 <mat-select formControlName="reason" class="full-width">
                     <mat-option *ngFor="let option of legalOptions" [value]="option.legalBasis">
                         {{ option.label }}
@@ -18,17 +18,17 @@
             </div>
 
             <div class="red-input-group" *ngIf="!isDictionaryRequest">
-                <label translate="manual-redaction.dialog.content.legalBasis"></label>
+                <label translate="manual-annotation.dialog.content.legalBasis"></label>
                 <input type="text" [value]="redactionForm.get('reason').value" disabled />
             </div>
 
             <div class="red-input-group">
-                <label translate="manual-redaction.dialog.content.comment"></label>
+                <label translate="manual-annotation.dialog.content.comment"></label>
                 <textarea formControlName="comment" name="comment" type="text" rows="4"></textarea>
             </div>
 
             <div class="red-input-group" *ngIf="isDictionaryRequest">
-                <label translate="manual-redaction.dialog.content.dictionary"></label>
+                <label translate="manual-annotation.dialog.content.dictionary"></label>
 
                 <mat-select formControlName="dictionary">
                     <mat-optgroup [label]="'group.redactions' | translate">
@@ -47,7 +47,7 @@
         </div>
 
         <div class="dialog-actions">
-            <button color="primary" mat-flat-button [disabled]="!redactionForm.valid" translate="manual-redaction.dialog.actions.save" type="submit"></button>
+            <button color="primary" mat-flat-button [disabled]="!redactionForm.valid" translate="manual-annotation.dialog.actions.save" type="submit"></button>
         </div>
     </form>
     <button (click)="dialogRef.close()" class="dialog-close" mat-icon-button>
diff --git a/apps/red-ui/src/app/screens/file/service/manual-annotation.service.ts b/apps/red-ui/src/app/screens/file/service/manual-annotation.service.ts
index aad86fb91..ef1a58d9e 100644
--- a/apps/red-ui/src/app/screens/file/service/manual-annotation.service.ts
+++ b/apps/red-ui/src/app/screens/file/service/manual-annotation.service.ts
@@ -82,9 +82,9 @@ export class ManualAnnotationService {
             .undo(this._appStateService.activeProjectId, this._appStateService.activeFileId, annotationWrapper.id)
             .pipe(
                 tap(
-                    () => this._notify('manual-annotation.undo-request.success'),
+                    () => this._notify('manual-annotation.undo.success'),
                     () => {
-                        this._notify('manual-annotation.undo-request.error', NotificationType.ERROR);
+                        this._notify('manual-annotation.undo.error', NotificationType.ERROR);
                     }
                 )
             );
@@ -99,9 +99,9 @@ export class ManualAnnotationService {
                 .declineRequest(this._appStateService.activeProjectId, this._appStateService.activeFileId, annotationWrapper.id)
                 .pipe(
                     tap(
-                        () => this._notify('manual-annotation.undo-request.success'),
+                        () => this._notify('manual-annotation.undo.success'),
                         () => {
-                            this._notify('manual-annotation.undo-request.error', NotificationType.ERROR);
+                            this._notify('manual-annotation.undo.error', NotificationType.ERROR);
                         }
                     )
                 );
@@ -110,9 +110,9 @@ export class ManualAnnotationService {
                 .undo(this._appStateService.activeProjectId, this._appStateService.activeFileId, annotationWrapper.id)
                 .pipe(
                     tap(
-                        () => this._notify('manual-annotation.undo-request.success'),
+                        () => this._notify('manual-annotation.undo.success'),
                         () => {
-                            this._notify('manual-annotation.undo-request.error', NotificationType.ERROR);
+                            this._notify('manual-annotation.undo.error', NotificationType.ERROR);
                         }
                     )
                 );
@@ -130,9 +130,9 @@ export class ManualAnnotationService {
                     .declineRequest(this._appStateService.activeProjectId, this._appStateService.activeFileId, annotationWrapper.id)
                     .pipe(
                         tap(
-                            () => this._notify('manual-annotation.undo-request.success'),
+                            () => this._notify('manual-annotation.undo.success'),
                             () => {
-                                this._notify('manual-annotation.undo-request.error', NotificationType.ERROR);
+                                this._notify('manual-annotation.undo.error', NotificationType.ERROR);
                             }
                         )
                     );
@@ -211,15 +211,15 @@ export class ManualAnnotationService {
     getTitle(type: 'DICTIONARY' | 'REDACTION') {
         if (this._permissionsService.isManagerAndOwner()) {
             if (type === 'DICTIONARY') {
-                return 'manual-redaction.dialog.header.dictionary';
+                return 'manual-annotation.dialog.header.dictionary';
             } else {
-                return 'manual-redaction.dialog.header.redaction';
+                return 'manual-annotation.dialog.header.redaction';
             }
         } else {
             if (type === 'DICTIONARY') {
-                return 'manual-redaction.dialog.header.request-dictionary';
+                return 'manual-annotation.dialog.header.request-dictionary';
             } else {
-                return 'manual-redaction.dialog.header.request-redaction';
+                return 'manual-annotation.dialog.header.request-redaction';
             }
         }
     }
diff --git a/apps/red-ui/src/app/screens/project-overview-screen/project-overview-screen.component.html b/apps/red-ui/src/app/screens/project-overview-screen/project-overview-screen.component.html
index 4a37067fb..bcffc76e3 100644
--- a/apps/red-ui/src/app/screens/project-overview-screen/project-overview-screen.component.html
+++ b/apps/red-ui/src/app/screens/project-overview-screen/project-overview-screen.component.html
@@ -166,7 +166,7 @@
                     <div [class.extend-cols]="fileStatus.isError" class="status-container">
                         <div *ngIf="fileStatus.isError" class="small-label error" translate="project-overview.file-listing.file-entry.file-error"></div>
                         <div *ngIf="fileStatus.isPending" class="small-label" translate="project-overview.file-listing.file-entry.file-pending"></div>
-                        <div *ngIf="fileStatus.isProcessing" class="small-label" translate="processing"></div>
+                        <div *ngIf="fileStatus.isProcessing" class="small-label" translate="project-overview.file-listing.file-entry.file-processing"></div>
                         <redaction-status-bar
                             *ngIf="fileStatus.isWorkable"
                             [config]="[
diff --git a/apps/red-ui/src/assets/i18n/en.json b/apps/red-ui/src/assets/i18n/en.json
index 8e9a2622a..df0888a87 100644
--- a/apps/red-ui/src/assets/i18n/en.json
+++ b/apps/red-ui/src/assets/i18n/en.json
@@ -6,38 +6,6 @@
         "heading-with-link": "Your user doesn't have the required RED-* roles to access this application. Please contact <a href={{adminUrl}}  target=_blank >your admin</a> for access!",
         "logout": "Logout"
     },
-    "manual-redaction": {
-        "confirm-annotation": {
-            "success": "Annotation Confirmed!",
-            "failed": "Error confirming Annotation removal!"
-        },
-        "remove-annotation": {
-            "success": "Annotation Suggested for removal!",
-            "failed": "Error requesting Annotation removal!"
-        },
-        "dialog": {
-            "header": {
-                "dictionary": "Add to dictionary",
-                "redaction": "Add Redaction",
-                "request-dictionary": "Request add to dictionary",
-                "request-redaction": "Request Redaction"
-            },
-            "add-redaction": {
-                "success": "Redaction suggestion added!",
-                "failed": "Failed to add manual redaction: {{message}}"
-            },
-            "actions": {
-                "save": "Save"
-            },
-            "content": {
-                "text": "Selected text:",
-                "dictionary": "Type",
-                "reason": "Reason",
-                "legalBasis": "Legal Basis",
-                "comment": "Comment"
-            }
-        }
-    },
     "app-name": "Redacto",
     "upload-status": {
         "dialog": {
@@ -373,5 +341,49 @@
         "redaction": "Redaction",
         "manual": "Manual Redaction",
         "declined-suggestion": "Declined Suggestion"
+    },
+    "manual-annotation": {
+        "dialog": {
+            "header": {
+                "dictionary": "Add to dictionary",
+                "redaction": "Add Redaction",
+                "request-dictionary": "Request add to dictionary",
+                "request-redaction": "Request Redaction"
+            },
+            "add-redaction": {
+                "success": "Redaction suggestion added!",
+                "failed": "Failed to add manual redaction: {{message}}"
+            },
+            "actions": {
+                "save": "Save"
+            },
+            "content": {
+                "text": "Selected text:",
+                "dictionary": "Type",
+                "reason": "Reason",
+                "legalBasis": "Legal Basis",
+                "comment": "Comment"
+            }
+        },
+        "approve-request": {
+            "success": "Request approved.",
+            "error": "Failed to approve request."
+        },
+        "undo": {
+            "success": "Action undone.",
+            "error": "Failed to undo action."
+        },
+        "redaction-request": {
+            "success": "Redaction requested.",
+            "error": "Failed to request redaction."
+        },
+        "remove-redaction-request": {
+            "success": "Redaction removed.",
+            "error": "Failed to remove redaction."
+        },
+        "redaction-add": {
+            "success": "Redaction added.",
+            "error": "Failed to add redaction."
+        }
     }
 }