From 2a8546ed43d352ee3a5e47e391a13dbb6d0227ae Mon Sep 17 00:00:00 2001
From: milanmajchrak <milan.majchrak@dataquest.sk>
Date: Wed, 22 May 2024 16:01:30 +0200
Subject: [PATCH 1/3] CS translation: `Klika polozky` translated to `Handle
 polozky`

---
 src/assets/i18n/cs.json5 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/assets/i18n/cs.json5 b/src/assets/i18n/cs.json5
index 0e4a0984268..6ac0b5ab8b6 100644
--- a/src/assets/i18n/cs.json5
+++ b/src/assets/i18n/cs.json5
@@ -656,7 +656,7 @@
   // "clarin.license.agreement.signer.header.info": ["The information below identifies you, the SIGNER. If the information is incorrect, please contact our", "Help Desk.", "This information will be stored as part of the electronic signatures."],
   "clarin.license.agreement.signer.header.info": ["Informace uvedené níže vás, PODEPSANÉHO, identifikují. Pokud jsou tyto informace nesprávné, kontaktujte prosím", "poradnu.", "Tyto informace budou uloženy spolu se záznamem o souhlasu."],
   // "clarin.license.agreement.item.handle": "Item handle",
-  "clarin.license.agreement.item.handle": "Klika položky",
+  "clarin.license.agreement.item.handle": "Handle položky",
   // "clarin.license.agreement.bitstream.name": "Bitstream",
   "clarin.license.agreement.bitstream.name": "Bitstream",
   // "clarin.license.agreement.signer.name": "Signer",

From abb7c8dfd7859f01e4107d73247dd798dc10d185 Mon Sep 17 00:00:00 2001
From: milanmajchrak <milan.majchrak@dataquest.sk>
Date: Thu, 23 May 2024 09:18:14 +0200
Subject: [PATCH 2/3] Added a new required info. Changed the way how the
 required messages are rendered. Updated old required info messages.

---
 ...arin-license-agreement-page.component.html |  2 +-
 .../clarin/clarin-license.resource-type.ts    | 16 ++++++++++-----
 src/assets/i18n/cs.json5                      | 12 +++++++++++
 src/assets/i18n/en.json5                      | 20 +++++++++++++++++++
 4 files changed, 44 insertions(+), 6 deletions(-)

diff --git a/src/app/bitstream-page/clarin-license-agreement-page/clarin-license-agreement-page.component.html b/src/app/bitstream-page/clarin-license-agreement-page/clarin-license-agreement-page.component.html
index 5d9c4574583..b73952718d5 100644
--- a/src/app/bitstream-page/clarin-license-agreement-page/clarin-license-agreement-page.component.html
+++ b/src/app/bitstream-page/clarin-license-agreement-page/clarin-license-agreement-page.component.html
@@ -43,7 +43,7 @@ <h2 id="header" class="border-bottom pb-2">{{'clarin.license.agreement.title' |
         </tr>
         <ng-container *ngIf="(currentUser$ | async) == null || (userMetadata$ | async)">
           <tr *ngFor="let requiredInfo of requiredInfo$ | async">
-            <td><b>{{requiredInfo.value}}</b></td>
+            <td><b>{{'clarin.license.agreement.signer.' + requiredInfo.name | translate}}</b></td>
             <td class="input-group">
               <input #requiredInfoRef class="rounded-sm max-width border-gray"
                      [value]="getMetadataValueByKey(requiredInfo.name)"
diff --git a/src/app/core/shared/clarin/clarin-license.resource-type.ts b/src/app/core/shared/clarin/clarin-license.resource-type.ts
index a07feaa9e0d..bee038f5e2e 100644
--- a/src/app/core/shared/clarin/clarin-license.resource-type.ts
+++ b/src/app/core/shared/clarin/clarin-license.resource-type.ts
@@ -27,14 +27,15 @@ export class ClarinLicenseRequiredInfo {
  */
 export const CLARIN_LICENSE_REQUIRED_INFO = {
   SEND_TOKEN: 'Email',
-  NAME: 'User name',
+  NAME: 'Name (given name and surname)',
   DOB: 'Date of birth',
   ADDRESS: 'Address',
   COUNTRY: 'Country',
-  EXTRA_EMAIL: 'Ask user for another email address',
-  ORGANIZATION: 'Ask user for organization (optional)',
-  REQUIRED_ORGANIZATION: 'Ask user for organization (mandatory)',
-  INTENDED_USE: 'Ask user for intentions with the item'
+  EXTRA_EMAIL: 'Email',
+  ORGANIZATION: 'Organization',
+  REQUIRED_ORGANIZATION: 'Organization',
+  INTENDED_USE: 'Intended use',
+  ACA_ORG_NAME_AND_SEAT: 'Name and seat (address) of your academic institution',
 };
 
 /**
@@ -85,6 +86,11 @@ export const CLARIN_LICENSE_FORM_REQUIRED_OPTIONS = [
     id: 8,
     value: CLARIN_LICENSE_REQUIRED_INFO.INTENDED_USE,
     name: 'INTENDED_USE'
+  }),
+  Object.assign(new ClarinLicenseRequiredInfo(), {
+    id: 9,
+    value: CLARIN_LICENSE_REQUIRED_INFO.INTENDED_USE,
+    name: 'INTENDED_USE'
   })
 ];
 
diff --git a/src/assets/i18n/cs.json5 b/src/assets/i18n/cs.json5
index 6ac0b5ab8b6..9ec3ed00478 100644
--- a/src/assets/i18n/cs.json5
+++ b/src/assets/i18n/cs.json5
@@ -667,6 +667,18 @@
   "clarin.license.agreement.token.info": "Obdržíte e-mail s pokyny ke stažení.",
   // "clarin.license.agreement.signer.ip.address": "Ip Address",
   "clarin.license.agreement.signer.ip.address": "IP adresa",
+//  "clarin.license.agreement.signer.SEND_TOKEN": "Email",
+  "clarin.license.agreement.signer.SEND_TOKEN": "Email",
+//  "clarin.license.agreement.signer.NAME": "Name (given name and surname)",
+  "clarin.license.agreement.signer.NAME": "Jméno a příjmení",
+  "clarin.license.agreement.signer.DOB": "Datum narození",
+  "clarin.license.agreement.signer.ADDRESS": "Adresa",
+  "clarin.license.agreement.signer.COUNTRY": "Země",
+  "clarin.license.agreement.signer.EXTRA_EMAIL": "E-mail",
+  "clarin.license.agreement.signer.ORGANIZATION": "Organizace",
+  "clarin.license.agreement.signer.REQUIRED_ORGANIZATION": "Organizace",
+  "clarin.license.agreement.signer.INTENDED_USE": "Zamýšlené použití",
+  "clarin.license.agreement.signer.ACA_ORG_NAME_AND_SEAT": "Název a sídlo vědecké instituce",
   // "clarin.license.agreement.button.agree": "I AGREE",
   "clarin.license.agreement.button.agree": "SOUHLASÍM",
   // "clarin.license.agreement.warning": "By clicking on the button below I, SIGNER with the above ID, agree to the LICENCE(s) restricting the usage of requested BITSTREAM(s).",
diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5
index 3ac546ade99..af2eb16dde2 100644
--- a/src/assets/i18n/en.json5
+++ b/src/assets/i18n/en.json5
@@ -692,6 +692,26 @@
 
   "clarin.license.agreement.signer.ip.address": "Ip Address",
 
+  "clarin.license.agreement.signer.SEND_TOKEN": "Email",
+
+  "clarin.license.agreement.signer.NAME": "Name (given name and surname)",
+
+  "clarin.license.agreement.signer.DOB": "Date of birth",
+
+  "clarin.license.agreement.signer.ADDRESS": "Address",
+
+  "clarin.license.agreement.signer.COUNTRY": "Country",
+
+  "clarin.license.agreement.signer.EXTRA_EMAIL": "Email",
+
+  "clarin.license.agreement.signer.ORGANIZATION": "Organization",
+
+  "clarin.license.agreement.signer.REQUIRED_ORGANIZATION": "Organization",
+
+  "clarin.license.agreement.signer.INTENDED_USE": "Intended use",
+
+  "clarin.license.agreement.signer.ACA_ORG_NAME_AND_SEAT": "Name and seat (address) of your academic institution",
+
   "clarin.license.agreement.button.agree": "I AGREE",
 
   "clarin.license.agreement.warning": "By clicking on the button below I, SIGNER with the above ID, agree to the LICENCE(s) restricting the usage of requested BITSTREAM(s).",

From 40f44ab2055b67c0161aa78bafe0866ba6426f33 Mon Sep 17 00:00:00 2001
From: milanmajchrak <milan.majchrak@dataquest.sk>
Date: Thu, 23 May 2024 09:24:27 +0200
Subject: [PATCH 3/3] Updated messages - for being consistent

---
 src/assets/i18n/cs.json5 | 12 ++++++++++--
 src/assets/i18n/en.json5 |  4 ++--
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/assets/i18n/cs.json5 b/src/assets/i18n/cs.json5
index 9ec3ed00478..3891178f1f6 100644
--- a/src/assets/i18n/cs.json5
+++ b/src/assets/i18n/cs.json5
@@ -667,17 +667,25 @@
   "clarin.license.agreement.token.info": "Obdržíte e-mail s pokyny ke stažení.",
   // "clarin.license.agreement.signer.ip.address": "Ip Address",
   "clarin.license.agreement.signer.ip.address": "IP adresa",
-//  "clarin.license.agreement.signer.SEND_TOKEN": "Email",
+  // "clarin.license.agreement.signer.SEND_TOKEN": "Email",
   "clarin.license.agreement.signer.SEND_TOKEN": "Email",
-//  "clarin.license.agreement.signer.NAME": "Name (given name and surname)",
+  // "clarin.license.agreement.signer.NAME": "Name (given name and surname)",
   "clarin.license.agreement.signer.NAME": "Jméno a příjmení",
+  // "clarin.license.agreement.signer.DOB": "Date of birth",
   "clarin.license.agreement.signer.DOB": "Datum narození",
+  // "clarin.license.agreement.signer.ADDRESS": "Address",
   "clarin.license.agreement.signer.ADDRESS": "Adresa",
+  // "clarin.license.agreement.signer.COUNTRY": "Country",
   "clarin.license.agreement.signer.COUNTRY": "Země",
+  // "clarin.license.agreement.signer.EXTRA_EMAIL": "E-mail",
   "clarin.license.agreement.signer.EXTRA_EMAIL": "E-mail",
+  // "clarin.license.agreement.signer.ORGANIZATION": "Organization",
   "clarin.license.agreement.signer.ORGANIZATION": "Organizace",
+  // "clarin.license.agreement.signer.REQUIRED_ORGANIZATION": "Organization",
   "clarin.license.agreement.signer.REQUIRED_ORGANIZATION": "Organizace",
+  // "clarin.license.agreement.signer.INTENDED_USE": "Intended use",
   "clarin.license.agreement.signer.INTENDED_USE": "Zamýšlené použití",
+  // "clarin.license.agreement.signer.ACA_ORG_NAME_AND_SEAT": "Name and seat (address) of your academic institution",
   "clarin.license.agreement.signer.ACA_ORG_NAME_AND_SEAT": "Název a sídlo vědecké instituce",
   // "clarin.license.agreement.button.agree": "I AGREE",
   "clarin.license.agreement.button.agree": "SOUHLASÍM",
diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5
index af2eb16dde2..3580657175e 100644
--- a/src/assets/i18n/en.json5
+++ b/src/assets/i18n/en.json5
@@ -692,7 +692,7 @@
 
   "clarin.license.agreement.signer.ip.address": "Ip Address",
 
-  "clarin.license.agreement.signer.SEND_TOKEN": "Email",
+  "clarin.license.agreement.signer.SEND_TOKEN": "E-mail",
 
   "clarin.license.agreement.signer.NAME": "Name (given name and surname)",
 
@@ -702,7 +702,7 @@
 
   "clarin.license.agreement.signer.COUNTRY": "Country",
 
-  "clarin.license.agreement.signer.EXTRA_EMAIL": "Email",
+  "clarin.license.agreement.signer.EXTRA_EMAIL": "E-mail",
 
   "clarin.license.agreement.signer.ORGANIZATION": "Organization",