From e81ab56a4adb54bdb069f59f34a71bd2f518c4ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adina=20=C8=9Aeudan?= <adina.teudan.ext@knecon.com>
Date: Wed, 29 Nov 2023 17:28:09 +0200
Subject: [PATCH] RED-7972: Updated labels

---
 .../edit-annotation-dialog.component.html      | 10 +++-------
 .../edit-redaction-dialog.component.html       | 18 +++++++-----------
 apps/red-ui/src/assets/i18n/scm/de.json        |  4 ++--
 apps/red-ui/src/assets/i18n/scm/en.json        |  4 ++--
 4 files changed, 14 insertions(+), 22 deletions(-)

diff --git a/apps/red-ui/src/app/modules/file-preview/dialogs/docu-mine/edit-annotation-dialog/edit-annotation-dialog.component.html b/apps/red-ui/src/app/modules/file-preview/dialogs/docu-mine/edit-annotation-dialog/edit-annotation-dialog.component.html
index f680ef1c2..7fdbdffd3 100644
--- a/apps/red-ui/src/app/modules/file-preview/dialogs/docu-mine/edit-annotation-dialog/edit-annotation-dialog.component.html
+++ b/apps/red-ui/src/app/modules/file-preview/dialogs/docu-mine/edit-annotation-dialog/edit-annotation-dialog.component.html
@@ -4,11 +4,7 @@
 
         <div class="dialog-content redaction">
             <div *ngIf="showList">
-                <label
-                    [translate]="'edit-redaction.dialog.content.redacted-text'"
-                    [translateParams]="{ length: redactedTexts.length }"
-                    class="selected-text"
-                ></label>
+                <label [translate]="'edit-redaction.dialog.content.redacted-text'" class="selected-text"></label>
                 <cdk-virtual-scroll-viewport
                     [itemSize]="16"
                     [ngStyle]="{ height: redactedTexts.length <= 5 ? 16 * redactedTexts.length + 'px' : 80 + 'px' }"
@@ -22,7 +18,7 @@
             <div class="iqser-input-group required w-450">
                 <label [translate]="'edit-redaction.dialog.content.type'"></label>
                 <mat-form-field>
-                    <mat-select formControlName="type" [placeholder]="'edit-redaction.dialog.content.unchanged' | translate">
+                    <mat-select [placeholder]="'edit-redaction.dialog.content.unchanged' | translate" formControlName="type">
                         <mat-select-trigger>{{ displayedDictionaryLabel }}</mat-select-trigger>
                         <mat-option
                             *ngFor="let dictionary of dictionaries"
@@ -55,10 +51,10 @@
 
         <div class="dialog-actions">
             <iqser-icon-button
+                [disabled]="!changed"
                 [label]="'edit-redaction.dialog.actions.save' | translate"
                 [submit]="true"
                 [type]="iconButtonTypes.primary"
-                [disabled]="!changed"
             >
             </iqser-icon-button>
 
diff --git a/apps/red-ui/src/app/modules/file-preview/dialogs/edit-redaction-dialog/edit-redaction-dialog.component.html b/apps/red-ui/src/app/modules/file-preview/dialogs/edit-redaction-dialog/edit-redaction-dialog.component.html
index de2afe834..192adcb8f 100644
--- a/apps/red-ui/src/app/modules/file-preview/dialogs/edit-redaction-dialog/edit-redaction-dialog.component.html
+++ b/apps/red-ui/src/app/modules/file-preview/dialogs/edit-redaction-dialog/edit-redaction-dialog.component.html
@@ -8,11 +8,7 @@
 
         <div class="dialog-content redaction">
             <div *ngIf="!isImage && redactedTexts" class="iqser-input-group">
-                <label
-                    [translateParams]="{ type: isImage ? 'image' : isHint ? 'hint' : 'redaction', length: redactedTexts.length }"
-                    [translate]="'edit-redaction.dialog.content.redacted-text'"
-                    class="selected-text"
-                ></label>
+                <label [translate]="'edit-redaction.dialog.content.redacted-text'" class="selected-text"></label>
                 <cdk-virtual-scroll-viewport
                     [itemSize]="16"
                     [ngStyle]="{ height: redactedTexts.length <= 5 ? 16 * redactedTexts.length + 'px' : 80 + 'px' }"
@@ -27,7 +23,7 @@
                 <label [translate]="'edit-redaction.dialog.content.type'"></label>
 
                 <mat-form-field>
-                    <mat-select formControlName="type" [placeholder]="'edit-redaction.dialog.content.unchanged' | translate">
+                    <mat-select [placeholder]="'edit-redaction.dialog.content.unchanged' | translate" formControlName="type">
                         <mat-select-trigger>{{ displayedDictionaryLabel }}</mat-select-trigger>
                         <mat-option
                             (click)="typeChanged()"
@@ -43,13 +39,13 @@
             </div>
 
             <ng-container *ngIf="showExtras">
-                <div class="iqser-input-group w-450" [class.required]="!someSkipped">
+                <div [class.required]="!someSkipped" class="iqser-input-group w-450">
                     <label [translate]="'edit-redaction.dialog.content.reason'"></label>
                     <mat-form-field>
                         <mat-select
+                            [placeholder]="!hidePlaceholder ? ('edit-redaction.dialog.content.unchanged' | translate) : ''"
                             class="full-width"
                             formControlName="reason"
-                            [placeholder]="!hidePlaceholder ? ('edit-redaction.dialog.content.unchanged' | translate) : ''"
                         >
                             <mat-option
                                 *ngFor="let option of legalOptions"
@@ -66,20 +62,20 @@
                 <div class="iqser-input-group w-450">
                     <label [translate]="'edit-redaction.dialog.content.legal-basis'"></label>
                     <input
+                        [placeholder]="!hidePlaceholder ? ('edit-redaction.dialog.content.unchanged' | translate) : ''"
                         [value]="form.controls.reason.value?.legalBasis"
                         disabled
                         type="text"
-                        [placeholder]="!hidePlaceholder ? ('edit-redaction.dialog.content.unchanged' | translate) : ''"
                     />
                 </div>
 
                 <div class="iqser-input-group w-450">
                     <label [translate]="'edit-redaction.dialog.content.section'"></label>
                     <input
+                        [placeholder]="'edit-redaction.dialog.content.unchanged' | translate"
                         formControlName="section"
                         name="section"
                         type="text"
-                        [placeholder]="'edit-redaction.dialog.content.unchanged' | translate"
                     />
                 </div>
             </ng-container>
@@ -87,10 +83,10 @@
             <div *ngIf="allRectangles" class="iqser-input-group w-400">
                 <label [translate]="'change-legal-basis-dialog.content.classification'"></label>
                 <input
+                    [placeholder]="'edit-redaction.dialog.content.unchanged' | translate"
                     formControlName="value"
                     name="classification"
                     type="text"
-                    [placeholder]="'edit-redaction.dialog.content.unchanged' | translate"
                 />
             </div>
 
diff --git a/apps/red-ui/src/assets/i18n/scm/de.json b/apps/red-ui/src/assets/i18n/scm/de.json
index f39e525c1..626c18f07 100644
--- a/apps/red-ui/src/assets/i18n/scm/de.json
+++ b/apps/red-ui/src/assets/i18n/scm/de.json
@@ -1210,7 +1210,7 @@
           }
         },
         "reason": "",
-        "redacted-text": "Selected {length, plural, one{annotation} other {annotations}}",
+        "redacted-text": "Annotated text",
         "section": "",
         "type": "Type",
         "unchanged": "Unchanged"
@@ -2470,4 +2470,4 @@
     }
   },
   "yesterday": "Gestern"
-}
\ No newline at end of file
+}
diff --git a/apps/red-ui/src/assets/i18n/scm/en.json b/apps/red-ui/src/assets/i18n/scm/en.json
index 196649293..3c4069612 100644
--- a/apps/red-ui/src/assets/i18n/scm/en.json
+++ b/apps/red-ui/src/assets/i18n/scm/en.json
@@ -1210,7 +1210,7 @@
           }
         },
         "reason": "",
-        "redacted-text": "Selected {length, plural, one{annotation} other {annotations}}",
+        "redacted-text": "Annotated text",
         "section": "",
         "type": "Type",
         "unchanged": "Unchanged"
@@ -2470,4 +2470,4 @@
     }
   },
   "yesterday": "Yesterday"
-}
\ No newline at end of file
+}