From 7a46e6d93cff1b44961c05f8b2832188604cdec5 Mon Sep 17 00:00:00 2001
From: Davide Negretti <davide.negretti@4science.it>
Date: Mon, 6 Feb 2023 11:21:12 +0100
Subject: [PATCH] [CST-7757] Labels renamed

---
 ...so-page-subscription-button.component.html |  6 ++--
 .../subscription-modal.component.html         | 12 +++----
 src/assets/i18n/en.json5                      | 34 +++++++++----------
 3 files changed, 25 insertions(+), 27 deletions(-)

diff --git a/src/app/shared/dso-page/dso-page-subscription-button/dso-page-subscription-button.component.html b/src/app/shared/dso-page/dso-page-subscription-button/dso-page-subscription-button.component.html
index 8601dcdda9..15135009fc 100644
--- a/src/app/shared/dso-page/dso-page-subscription-button/dso-page-subscription-button.component.html
+++ b/src/app/shared/dso-page/dso-page-subscription-button/dso-page-subscription-button.component.html
@@ -1,8 +1,8 @@
 <button *ngIf="isAuthorized$ | async" data-test="subscription-button"
         (click)="openSubscriptionModal()"
-        [ngbTooltip]="'item.page.subscriptions.tooltip' | translate"
-        [title]="'item.page.subscriptions.tooltip' | translate"
-        [attr.aria-label]="'item.page.subscriptions.tooltip' | translate"
+        [ngbTooltip]="'subscriptions.tooltip' | translate"
+        [title]="'subscriptions.tooltip' | translate"
+        [attr.aria-label]="'subscriptions.tooltip' | translate"
         class="subscription-button btn btn-dark btn-sm">
   <i class="fas fa-bell fa-fw"></i>
 </button>
diff --git a/src/app/shared/subscriptions/subscription-modal/subscription-modal.component.html b/src/app/shared/subscriptions/subscription-modal/subscription-modal.component.html
index debc6edf50..e095e094dc 100644
--- a/src/app/shared/subscriptions/subscription-modal/subscription-modal.component.html
+++ b/src/app/shared/subscriptions/subscription-modal/subscription-modal.component.html
@@ -1,6 +1,6 @@
 <form *ngIf="subscriptionForm" [formGroup]="subscriptionForm" (ngSubmit)="submit()" data-test="subscription-form">
   <div class="modal-header">
-    <h4 class="modal-title">{{'item.page.subscriptions.modal.title' | translate}}</h4>
+    <h4 class="modal-title">{{'subscriptions.modal.title' | translate}}</h4>
     <button type="button" class="close" aria-label="Close" (click)="activeModal.close()">
       <span aria-hidden="true">&times;</span>
     </button>
@@ -10,14 +10,14 @@
     <div>
       <fieldset *ngFor="let subscriptionType of subscriptionForm?.controls | keyvalue" formGroupName="{{subscriptionType.key}}" class="form-group form-row">
         <legend class="col-md-4 col-form-label float-md-left pt-0">
-          {{ 'item.page.subscriptions.modal.new-subscription-form.type.' + subscriptionType.key | translate }}:
+          {{ 'subscriptions.modal.new-subscription-form.type.' + subscriptionType.key | translate }}:
         </legend>
         <div class="col-md-8">
           <input type="hidden" formControlName="subscriptionId" [value]="subscriptionType?.value?.controls['subscriptionId'].value" >
           <div class="form-check" formGroupName="frequencies" *ngFor="let frequency of subscriptionType?.value?.controls['frequencies'].controls | keyvalue">
             <input type="checkbox" [id]="'checkbox-' + frequency" class="form-check-input" [formControlName]="frequency.key"/>
             <label class="form-check-label"
-                   [for]="'checkbox-' + frequency.key">{{ 'item.page.subscriptions.modal.new-subscription-form.frequency.' + frequency.key | translate }}</label>
+                   [for]="'checkbox-' + frequency.key">{{ 'subscriptions.modal.new-subscription-form.frequency.' + frequency.key | translate }}</label>
           </div>
         </div>
         <ds-alert *ngIf="!!submitted && subscriptionType?.value?.controls['frequencies'].errors?.required" [type]="'alert-danger'">
@@ -29,14 +29,14 @@
   <div class="modal-footer">
     <button type="button" class="btn btn-outline-secondary"
             (click)="activeModal.close()">
-      {{'item.page.subscriptions.modal.close' | translate}}
+      {{'subscriptions.modal.close' | translate}}
     </button>
     <button type="submit" class="btn btn-success" [disabled]="(processing$ | async) || !isValid">
         <span *ngIf="(processing$ | async)">
-          <i class='fas fa-circle-notch fa-spin'></i> {{'item.page.subscriptions.modal.new-subscription-form.processing' | translate}}
+          <i class='fas fa-circle-notch fa-spin'></i> {{'subscriptions.modal.new-subscription-form.processing' | translate}}
         </span>
       <span *ngIf="!(processing$ | async)">
-        {{'item.page.subscriptions.modal.new-subscription-form.submit' | translate}}
+        {{'subscriptions.modal.new-subscription-form.submit' | translate}}
       </span>
     </button>
   </div>
diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5
index 6e861cd61a..be9ffc99ed 100644
--- a/src/assets/i18n/en.json5
+++ b/src/assets/i18n/en.json5
@@ -2322,24 +2322,6 @@
 
   "item.page.claim.tooltip": "Claim this item as profile",
 
-  "item.page.subscriptions.tooltip": "Subscribe",
-
-  "item.page.subscriptions.modal.title": "Subscriptions",
-
-  "item.page.subscriptions.modal.type-frequency": "Type and frequency",
-
-  "item.page.subscriptions.modal.close": "Close",
-
-  "item.page.subscriptions.modal.new-subscription-form.type.content": "Content",
-
-  "item.page.subscriptions.modal.new-subscription-form.frequency.D": "Daily",
-
-  "item.page.subscriptions.modal.new-subscription-form.frequency.W": "Weekly",
-
-  "item.page.subscriptions.modal.new-subscription-form.frequency.M": "Monthly",
-
-  "item.page.subscriptions.modal.new-subscription-form.submit": "Submit",
-
   "item.preview.dc.identifier.uri": "Identifier:",
 
   "item.preview.dc.contributor.author": "Authors:",
@@ -4599,7 +4581,23 @@
 
   "subscriptions.frequency.W": "Weekly",
 
+  "subscriptions.tooltip": "Subscribe",
 
+  "subscriptions.modal.title": "Subscriptions",
+
+  "subscriptions.modal.type-frequency": "Type and frequency",
+
+  "subscriptions.modal.close": "Close",
+
+  "subscriptions.modal.new-subscription-form.type.content": "Content",
+
+  "subscriptions.modal.new-subscription-form.frequency.D": "Daily",
+
+  "subscriptions.modal.new-subscription-form.frequency.W": "Weekly",
+
+  "subscriptions.modal.new-subscription-form.frequency.M": "Monthly",
+
+  "subscriptions.modal.new-subscription-form.submit": "Submit",
 
   "subscriptions.modal.create.success": "Subscribed to {{ type }} successfully.",