From 41592c9ad2b6659b763c8c9d8989608deaf7057f Mon Sep 17 00:00:00 2001
From: Okke Harsta <oharsta@zilverline.com>
Date: Mon, 27 Jan 2025 15:32:57 +0100
Subject: [PATCH] Localized ServiceDesk in new I18n

---
 account-gui/src/locale/I18n.js              | 12 ++--
 account-gui/src/locale/en.js                | 13 +---
 account-gui/src/locale/js/en/strings.json   | 16 +++--
 account-gui/src/locale/js/nl/strings.json   | 12 +++-
 account-gui/src/locale/nl.js                | 13 +---
 account-gui/src/verify/ServiceDesk.svelte   | 16 ++---
 myconext-gui/src/locale/I18n.js             |  8 +--
 myconext-gui/src/locale/en.js               | 41 -------------
 myconext-gui/src/locale/js/en/strings.json  | 39 +++++++++++-
 myconext-gui/src/locale/js/nl/strings.json  | 41 ++++++++++++-
 myconext-gui/src/locale/nl.js               | 43 +------------
 myconext-gui/src/routes/PersonalInfo.svelte |  6 +-
 myconext-gui/src/utils/services.js          | 56 ++++++++---------
 myconext-gui/src/verify/ServiceDesk.svelte  | 68 ++++++++++-----------
 14 files changed, 181 insertions(+), 203 deletions(-)

diff --git a/account-gui/src/locale/I18n.js b/account-gui/src/locale/I18n.js
index 2f078ca7..0cb7faa2 100644
--- a/account-gui/src/locale/I18n.js
+++ b/account-gui/src/locale/I18n.js
@@ -12,12 +12,7 @@ const format = (msg, ...args) => {
     let result = msg;
     for (let i = 0; i < args.length; i++) {
         const pos = i + 1;
-        if (typeof args[i] === "string") {
-            result = result.replace("%" + pos + "$s", args[i]);
-        }
-        if (typeof args[i] === "number") {
-            result = result.replace("%" + pos + "$d", args[i]);
-        }
+        result = result.replace("%" + pos + "$s", args[i]);
     }
     return result;
 };
@@ -25,7 +20,10 @@ const format = (msg, ...args) => {
 let locale = "en"
 
 const I18n = {
-    changeLocale: lang => locale = lang,
+    changeLocale: lang => {
+        locale = lang;
+        I18nLocal.locale = lang;
+    },
     currentLocale: () => locale,
     t: (key, model = {}, fallback = null) => {
         const msg = translations[locale][key]
diff --git a/account-gui/src/locale/en.js b/account-gui/src/locale/en.js
index edc42cc0..3b9e4eaa 100644
--- a/account-gui/src/locale/en.js
+++ b/account-gui/src/locale/en.js
@@ -423,18 +423,9 @@ const en =  {
         issuers: {
             eherkenning: "eIDAS",
             idin: "Idin",
-            studielink: "Studielink"
+            studielink: "Studielink",
+            servicedesk: "Service Desk"
         }
-    },
-    serviceDesk: {
-        confirmIdentityHeader: "You need to manually confirm your identity",
-        confirmIdentity: "You must confirm your identity at one of our eduID Service Desks.",
-        stepsHeader: "Follow these steps:",
-        step1: "Enter your full name as it appears on your ID (first and last name).",
-        step2: "Generate a personal verification code.",
-        step3: "Present your code and ID to an eduID Service Desk. They will verify your identity manually.",
-        redirectWarning: "We will redirect you to another website to enter your name. You won’t be able to log in to <strong>{{service}}</strong> immediately afterward; you will first need to contact a eduID Service Desk.",
-        next: "Open website to enter your name"
     }
 };
 export default en;
diff --git a/account-gui/src/locale/js/en/strings.json b/account-gui/src/locale/js/en/strings.json
index 02cfee73..523f1b8f 100644
--- a/account-gui/src/locale/js/en/strings.json
+++ b/account-gui/src/locale/js/en/strings.json
@@ -1,5 +1,4 @@
 {
-
   "About.Info.COPY": "App information",
   "Sidebar.Home.COPY": "Home",
   "Sidebar.PersonalInfo.COPY": "Personal info",
@@ -580,7 +579,7 @@
   "MagicLink.OpenMailTitle.COPY": "Open your e-mail",
   "MagicLink.OpenMailDisclaimer.COPY": "Can't find the email? Check the spam folder",
   "MagicLink.Header.COPY": "Check your email",
-  "MagicLink.Info.COPY": "Press the link we sent to %1$s.",
+  "MagicLink.Info.COPY": "Press the link we sent to ",
   "MagicLink.Awaiting.COPY": "Waiting for you to press the link…",
   "MagicLink.OpenGMail.COPY": "Open gmail.com",
   "MagicLink.OpenOutlook.COPY": "Open outlook.com",
@@ -823,5 +822,14 @@
   "ExternalAccountLinkingError.Subtitle.COPY": "We’re sorry, we were unable to retrieve the requested information.",
   "ExternalAccountLinkingError.TryAnotherOption.COPY": "Please try another method",
   "ReferenceNames.Idin.COPY": "iDIN",
-  "ReferenceNames.Eherkenning.COPY": "eIDAS"
-}
+  "ReferenceNames.Eherkenning.COPY": "eIDAS",
+  "ServiceDesk.ConfirmIdentityHeader.COPY": "You need to manually confirm your identity",
+  "ServiceDesk.ConfirmIdentity.COPY": "You must confirm your identity at one of our eduID Service Desks.",
+  "ServiceDesk.StepsHeader.COPY": "Follow these steps:",
+  "ServiceDesk.Step1.COPY": "Enter your full name as it appears on your ID (first and last name).",
+  "ServiceDesk.Step2.COPY": "Generate a personal verification code.",
+  "ServiceDesk.Step3.COPY": "Present your code and ID to an eduID Service Desk. They will verify your identity manually.",
+  "ServiceDesk.RedirectWarning.COPY": "We will redirect you to another website to enter your name. You won’t be able to log in to <strong>%1$s</strong> immediately afterward; you will first need to contact a eduID Service Desk.",
+  "ServiceDesk.Next.COPY": "Open website to enter your name"
+
+}
\ No newline at end of file
diff --git a/account-gui/src/locale/js/nl/strings.json b/account-gui/src/locale/js/nl/strings.json
index 63f1968b..24c2afb5 100644
--- a/account-gui/src/locale/js/nl/strings.json
+++ b/account-gui/src/locale/js/nl/strings.json
@@ -580,7 +580,7 @@
   "MagicLink.OpenMailTitle.COPY": "Open je e-mail",
   "MagicLink.OpenMailDisclaimer.COPY": "Kun je de mail niet vinden? Kijk ook in de spam folder",
   "MagicLink.Header.COPY": "Controleer je e-mail",
-  "MagicLink.Info.COPY": "Druk op de link die we verstuurd hebben naar %1$s.",
+  "MagicLink.Info.COPY": "Druk op de link die we verstuurd hebben naar ",
   "MagicLink.Awaiting.COPY": "Wachten tot je op de link drukt…",
   "MagicLink.OpenGMail.COPY": "Open gmail.com",
   "MagicLink.OpenOutlook.COPY": "Open outlook.com",
@@ -823,5 +823,13 @@
   "ExternalAccountLinkingError.Subtitle.COPY": "Helaas konden we de gevraagde gegevens niet ophalen.",
   "ExternalAccountLinkingError.TryAnotherOption.COPY": "Probeer een andere manier",
   "ReferenceNames.Idin.COPY": "iDIN",
-  "ReferenceNames.Eherkenning.COPY": "eIDAS"
+  "ReferenceNames.Eherkenning.COPY": "eIDAS",
+  "ServiceDesk.ConfirmIdentityHeader.COPY": "Bevestig wie je bent met je identiteitsbewijs",
+  "ServiceDesk.ConfirmIdentity.COPY": "Je kunt je identiteit ook bevestigen via een van onze eduID Service Desks.",
+  "ServiceDesk.StepsHeader.COPY": "Volg deze stappen:",
+  "ServiceDesk.Step1.COPY": "Vul je volledige naam in zoals die op je identiteitsbewijs staat (voornamen en achternaam).",
+  "ServiceDesk.Step2.COPY": "Genereer een persoonlijke controlecode.",
+  "ServiceDesk.Step3.COPY": "Laat je controlecode en identiteitsbewijs zien aan een eduID Service Desk. Die bevestigt zo je identiteit.",
+  "ServiceDesk.RedirectWarning.COPY": "We sturen je door naar een andere website om je naam in te vullen. Je kunt daarna nog niet gelijk inloggen bij <strong>%1$s</strong>, maar je moet eerst contact opnemen met een eduID Service Desk.",
+  "ServiceDesk.Next.COPY": "Naar gegevens invullen"
 }
diff --git a/account-gui/src/locale/nl.js b/account-gui/src/locale/nl.js
index 0a051b0e..a5a879c5 100644
--- a/account-gui/src/locale/nl.js
+++ b/account-gui/src/locale/nl.js
@@ -422,18 +422,9 @@ const nl = {
         issuers: {
             eherkenning: "eIDAS",
             idin: "Idin",
-            studielink: "Studielink"
+            studielink: "Studielink",
+            servicedesk: "Service Desk"
         }
-    },
-    serviceDesk: {
-        confirmIdentityHeader: "Bevestig wie je bent met je identiteitsbewijs",
-        confirmIdentity: "Je kunt je identiteit ook bevestigen via een van onze eduID Service Desks.",
-        stepsHeader: "Volg deze stappen:",
-        step1: "Vul je volledige naam in zoals die op je identiteitsbewijs staat (voornamen en achternaam).",
-        step2: "Genereer een persoonlijke controlecode.",
-        step3: "Laat je controlecode en identiteitsbewijs zien aan een eduID Service Desk. Die bevestigt zo je identiteit.",
-        redirectWarning: "We sturen je door naar een andere website om je naam in te vullen. Je kunt daarna nog niet gelijk inloggen bij <strong>{{service}}</strong>, maar je moet eerst contact opnemen met een eduID Service Desk.",
-        next: "Naar gegevens invullen"
     }
 };
 export default nl;
\ No newline at end of file
diff --git a/account-gui/src/verify/ServiceDesk.svelte b/account-gui/src/verify/ServiceDesk.svelte
index 2c579875..00852402 100644
--- a/account-gui/src/verify/ServiceDesk.svelte
+++ b/account-gui/src/verify/ServiceDesk.svelte
@@ -91,20 +91,20 @@
             <span class="back" on:click={() => toggleView()}>
                 {@html arrowLeftIcon}
             </span>
-        <h2 class="header">{I18n.t("serviceDesk.confirmIdentityHeader")}</h2>
+        <h2 class="header">{I18n.t("ServiceDesk.ConfirmIdentityHeader.COPY")}</h2>
     </div>
-    <p>{I18n.t("serviceDesk.confirmIdentity")}</p>
-    <p class="steps">{I18n.t("serviceDesk.stepsHeader")}</p>
+    <p>{I18n.t("ServiceDesk.ConfirmIdentity.COPY")}</p>
+    <p class="steps">{I18n.t("ServiceDesk.StepsHeader.COPY")}</p>
     <ol>
-        <li>{I18n.t("serviceDesk.step1")}</li>
-        <li>{I18n.t("serviceDesk.step2")}</li>
-        <li>{I18n.t("serviceDesk.step3")}</li>
+        <li>{I18n.t("ServiceDesk.Step1.COPY")}</li>
+        <li>{I18n.t("ServiceDesk.Step2.COPY")}</li>
+        <li>{I18n.t("ServiceDesk.Step3.COPY")}</li>
     </ol>
     <div class="redirect">
         {@html alertSvg}
-        <span>{@html I18n.t("serviceDesk.redirectWarning", {service: serviceName})}</span>
+        <span>{@html I18n.t("ServiceDesk.RedirectWarning.COPY", {service: serviceName})}</span>
     </div>
-    <Button label={I18n.t("serviceDesk.next")}
+    <Button label={I18n.t("ServiceDesk.Next.COPY")}
             large={true}
             onClick={() => proceed()}/>
 
diff --git a/myconext-gui/src/locale/I18n.js b/myconext-gui/src/locale/I18n.js
index 9a0226ad..ef861713 100644
--- a/myconext-gui/src/locale/I18n.js
+++ b/myconext-gui/src/locale/I18n.js
@@ -13,12 +13,7 @@ const format = (msg, ...args) => {
     let result = msg;
     for (let i = 0; i < args.length; i++) {
         const pos = i + 1;
-        if (typeof args[i] === "string") {
-            result = result.replace("%" + pos + "$s", args[i]);
-        }
-        if (typeof args[i] === "number") {
-            result = result.replace("%" + pos + "$d", args[i]);
-        }
+        result = result.replace("%" + pos + "$s", args[i]);
     }
     return result;
 };
@@ -28,6 +23,7 @@ let locale = "en"
 const I18n = {
     changeLocale: lang => {
         locale = lang;
+        I18nLocal.locale = lang;
     },
     currentLocale: () => locale,
     t: (key, model = {}, fallback = null) => {
diff --git a/myconext-gui/src/locale/en.js b/myconext-gui/src/locale/en.js
index f231abc7..b43e7d06 100644
--- a/myconext-gui/src/locale/en.js
+++ b/myconext-gui/src/locale/en.js
@@ -575,47 +575,6 @@
             idin: "Idin",
             studielink: "Studielink",
             servicedesk: "Service Desk"
-        },
-        serviceDesk: {
-            confirmIdentityHeader: "You need to manually confirm your identity",
-            confirmIdentity: "You can also confirm your identity at one of our eduID Service Desks.",
-            stepsHeader: "Follow these steps:",
-            step1: "Enter your full name as it appears on your ID (first and last name).",
-            step2: "Generate a personal verification code.",
-            step3: "Present your code and ID to an eduID Service Desk. They will verify your identity manually.",
-            acceptedIds: "Accepted IDs:",
-            passports: "Passports",
-            eea: "EEA<sup>*</sup> ID cards",
-            driverLicense: "Dutch driver's license",
-            residencePermit: "Dutch residence permits",
-            note: "Please note: copies, public transport passes and student cards are not valid ID's",
-            eeaNote: "<sup>*</sup>EEA: all EU member states plus Liechtenstein, Norway and Iceland",
-            next: "Enter your details",
-            idCard: {
-                information: "Enter your details as they appear on your ID. Names must be in Roman characters.",
-                lastName: "Last name",
-                firstName: "First name(s)",
-                dayOfBirth: "Date of birth",
-                generateControlCode: "Generate verification code"
-            },
-            controlCode: {
-                controlCode: "Verification code",
-                yourControlCode: "Your verification code",
-                info: "You will also receive an email with this code. The code is valid for {{nbr}} more days and is intended for:",
-                typoPrefix: "Made a typo? ",
-                typoLink: "Edit your details",
-                todo: "What's next?",
-                todoDetails: "Schedule an appointment with an eduID Service Desk (online or in person). During your appointment, show your verification code and ID.",
-                serviceDesks: "Show eduID Service Desks",
-                serviceDesksLocations: "https://wiki.surfnet.nl/display/EDUID/eduID+Service+Desk",
-                back: "Back to overview",
-                rethink: "Want to prove your identity another way? Make sure to delete your verification code first.",
-                deleteControlCode: "Delete verification code",
-                deletedControlCode: "Verification code deleted",
-                banner: "Verify your identity at an eduID Service Desk by presenting your ID and verification code.",
-                showCode: "Show code",
-                validityCode: "Your code is valid for {{nbr}} more days."
-            }
         }
     }
 };
diff --git a/myconext-gui/src/locale/js/en/strings.json b/myconext-gui/src/locale/js/en/strings.json
index dd957897..c9c62e04 100644
--- a/myconext-gui/src/locale/js/en/strings.json
+++ b/myconext-gui/src/locale/js/en/strings.json
@@ -580,7 +580,7 @@
   "MagicLink.OpenMailTitle.COPY": "Open your e-mail",
   "MagicLink.OpenMailDisclaimer.COPY": "Can't find the email? Check the spam folder",
   "MagicLink.Header.COPY": "Check your email",
-  "MagicLink.Info.COPY": "Press the link we sent to %1$s.",
+  "MagicLink.Info.COPY": "Press the link we sent to ",
   "MagicLink.Awaiting.COPY": "Waiting for you to press the link…",
   "MagicLink.OpenGMail.COPY": "Open gmail.com",
   "MagicLink.OpenOutlook.COPY": "Open outlook.com",
@@ -823,5 +823,40 @@
   "ExternalAccountLinkingError.Subtitle.COPY": "We’re sorry, we were unable to retrieve the requested information.",
   "ExternalAccountLinkingError.TryAnotherOption.COPY": "Please try another method",
   "ReferenceNames.Idin.COPY": "iDIN",
-  "ReferenceNames.Eherkenning.COPY": "eIDAS"
+  "ReferenceNames.Eherkenning.COPY": "eIDAS",
+  "ServiceDesk.ConfirmIdentityHeader.COPY": "You need to manually confirm your identity",
+  "ServiceDesk.ConfirmIdentity.COPY": "You can also confirm your identity at one of our eduID Service Desks.",
+  "ServiceDesk.StepsHeader.COPY": "Follow these steps:",
+  "ServiceDesk.Step1.COPY": "Enter your full name as it appears on your ID (first and last name).",
+  "ServiceDesk.Step2.COPY": "Generate a personal verification code.",
+  "ServiceDesk.Step3.COPY": "Present your code and ID to an eduID Service Desk. They will verify your identity manually.",
+  "ServiceDesk.AcceptedIds.COPY": "Accepted IDs:",
+  "ServiceDesk.Passports.COPY": "Passports",
+  "ServiceDesk.Eea.COPY": "EEA<sup>*</sup> ID cards",
+  "ServiceDesk.DriverLicense.COPY": "Dutch driver's license",
+  "ServiceDesk.ResidencePermit.COPY": "Dutch residence permits",
+  "ServiceDesk.Note.COPY": "Please note: copies, public transport passes and student cards are not valid ID's",
+  "ServiceDesk.EeaNote.COPY": "<sup>*</sup>EEA: all EU member states plus Liechtenstein, Norway and Iceland",
+  "ServiceDesk.Next.COPY": "Enter your details",
+  "ServiceDesk.IdCard.Information.COPY": "Enter your details as they appear on your ID. Names must be in Roman characters.",
+  "ServiceDesk.IdCard.LastName.COPY": "Last name",
+  "ServiceDesk.IdCard.FirstName.COPY": "First name(s)",
+  "ServiceDesk.IdCard.DayOfBirth.COPY": "Date of birth",
+  "ServiceDesk.IdCard.GenerateControlCode.COPY": "Generate verification code",
+  "ServiceDesk.ControlCode.ControlCode.COPY": "Verification code",
+  "ServiceDesk.ControlCode.YourControlCode.COPY": "Your verification code",
+  "ServiceDesk.ControlCode.Info.COPY": "You will also receive an email with this code. The code is valid for %1$s more days and is intended for:",
+  "ServiceDesk.ControlCode.TypoPrefix.COPY": "Made a typo? ",
+  "ServiceDesk.ControlCode.TypoLink.COPY": "Edit your details",
+  "ServiceDesk.ControlCode.Todo.COPY": "What's next?",
+  "ServiceDesk.ControlCode.TodoDetails.COPY": "Schedule an appointment with an eduID Service Desk (online or in person). During your appointment, show your verification code and ID.",
+  "ServiceDesk.ControlCode.ServiceDesks.COPY": "Show eduID Service Desks",
+  "ServiceDesk.ControlCode.ServiceDesksLocations.COPY": "https://wiki.surfnet.nl/display/EDUID/eduID+Service+Desk",
+  "ServiceDesk.ControlCode.Back.COPY": "Back to overview",
+  "ServiceDesk.ControlCode.Rethink.COPY": "Want to prove your identity another way? Make sure to delete your verification code first.",
+  "ServiceDesk.ControlCode.DeleteControlCode.COPY": "Delete verification code",
+  "ServiceDesk.ControlCode.DeletedControlCode.COPY": "Verification code deleted",
+  "ServiceDesk.ControlCode.Banner.COPY": "Verify your identity at an eduID Service Desk by presenting your ID and verification code.",
+  "ServiceDesk.ControlCode.ShowCode.COPY": "Show code",
+  "ServiceDesk.ControlCode.ValidityCode.COPY": "Your code is valid for %1$s more days."
 }
diff --git a/myconext-gui/src/locale/js/nl/strings.json b/myconext-gui/src/locale/js/nl/strings.json
index bd0c4095..872fc201 100644
--- a/myconext-gui/src/locale/js/nl/strings.json
+++ b/myconext-gui/src/locale/js/nl/strings.json
@@ -580,7 +580,7 @@
   "MagicLink.OpenMailTitle.COPY": "Open je e-mail",
   "MagicLink.OpenMailDisclaimer.COPY": "Kun je de mail niet vinden? Kijk ook in de spam folder",
   "MagicLink.Header.COPY": "Controleer je e-mail",
-  "MagicLink.Info.COPY": "Druk op de link die we verstuurd hebben naar %1$s.",
+  "MagicLink.Info.COPY": "Druk op de link die we verstuurd hebben naar ",
   "MagicLink.Awaiting.COPY": "Wachten tot je op de link drukt…",
   "MagicLink.OpenGMail.COPY": "Open gmail.com",
   "MagicLink.OpenOutlook.COPY": "Open outlook.com",
@@ -823,5 +823,42 @@
   "ExternalAccountLinkingError.Subtitle.COPY": "Helaas konden we de gevraagde gegevens niet ophalen.",
   "ExternalAccountLinkingError.TryAnotherOption.COPY": "Probeer een andere manier",
   "ReferenceNames.Idin.COPY": "iDIN",
-  "ReferenceNames.Eherkenning.COPY": "eIDAS"
+  "ReferenceNames.Eherkenning.COPY": "eIDAS",
+  "ServiceDesk.ConfirmIdentityHeader.COPY": "Bevestig wie je bent met je identiteitsbewijs",
+  "ServiceDesk.ConfirmIdentity.COPY": "Je kunt je identiteit ook bevestigen via een van onze eduID Service Desks.",
+  "ServiceDesk.StepsHeader.COPY": "Volg deze stappen:",
+  "ServiceDesk.Step1.COPY": "Vul je volledige naam in zoals die op je identiteitsbewijs staat (voornamen en achternaam).",
+  "ServiceDesk.Step2.COPY": "Genereer een persoonlijke controlecode.",
+  "ServiceDesk.Step3.COPY": "Laat je controlecode en identiteitsbewijs zien aan een eduID Service Desk. Die bevestigt zo je identiteit.",
+  "ServiceDesk.AcceptedIds.COPY": "Geldige identiteitsbewijzen:",
+  "ServiceDesk.Passports.COPY": "paspoorten",
+  "ServiceDesk.Eea.COPY": "EEA<sup>*</sup> ID-kaarten",
+  "ServiceDesk.DriverLicense.COPY": "Nederlandse rijbewijzen",
+  "ServiceDesk.ResidencePermit.COPY": "Nederlandse verblijfsvergunningen",
+  "ServiceDesk.Note.COPY": "Let op: kopieën, OV-kaarten en studentenkaarten zijn geen geldige identiteitsbewijzen.",
+  "ServiceDesk.EeaNote.COPY":"<sup>*</sup>EEA: alle EU-lidstaten + Liechtenstein, Noorwegen en IJsland.",
+  "ServiceDesk.Next.COPY":  "Naar gegevens invullen",
+  "ServiceDesk.IdCard.Information.COPY": "Vul je gegevens in zoals die op je identiteitsbewijs staan.",
+  "ServiceDesk.IdCard.LastName.COPY": "Achternaam",
+  "ServiceDesk.IdCard.FirstName.COPY": "Voornamen",
+  "ServiceDesk.IdCard.DayOfBirth.COPY": "Geboortedatum",
+  "ServiceDesk.IdCard.GenerateControlCode.COPY": "Genereer controlcode",
+  "ServiceDesk.ControlCode.ControlCode.COPY":  "Controlecode",
+  "ServiceDesk.ControlCode.YourControlCode.COPY": "Je controlecode",
+  "ServiceDesk.ControlCode.Info.COPY": "Je krijgt ook een e-mail met deze code. De code is %1$s dagen geldig en is bedoeld voor:",
+  "ServiceDesk.ControlCode.TypoPrefix.COPY": "Typfout gemaakt? ",
+  "ServiceDesk.ControlCode.TypoLink.COPY": "Pas gegevens aan",
+  "ServiceDesk.ControlCode.Todo.COPY": "Wat moet je nu doen?",
+  "ServiceDesk.ControlCode.TodoDetails.COPY": "Maak een afspraak met een eduID Service Desk (digitaal of op locatie). Laat tijdens je afspraak je controlecode en identiteisbewijs zien.",
+  "ServiceDesk.ControlCode.ServiceDesks.COPY":  "Bekijk eduID Service Desks",
+  "ServiceDesk.ControlCode.ServiceDesksLocations.COPY": "https://wiki.surfnet.nl/display/EDUID/eduID+Service+Desk",
+  "ServiceDesk.ControlCode.Back.COPY": "Terug naar overzicht",
+  "ServiceDesk.ControlCode.Rethink.COPY":"Wil je toch op een andere manier bewijzen wie je bent? Verwijder dan eerst je controlecode.",
+  "ServiceDesk.ControlCode.DeleteControlCode.COPY":  "Verwijder controlecode",
+  "ServiceDesk.ControlCode.DeletedControlCode.COPY":  "Verificatie-code verwijderd",
+  "ServiceDesk.ControlCode.Banner.COPY": "Bevestig je identiteit bij een eduID Service Desk. Dit doe je door je identiteitsbewijs en controlecode te laten zien.",
+  "ServiceDesk.ControlCode.ShowCode.COPY": "Toon code",
+  "ServiceDesk.ControlCode.ValidityCode.COPY": "Je code is nog geldig voor %1$s dagen."
+
+
 }
diff --git a/myconext-gui/src/locale/nl.js b/myconext-gui/src/locale/nl.js
index b647492c..e279bec0 100644
--- a/myconext-gui/src/locale/nl.js
+++ b/myconext-gui/src/locale/nl.js
@@ -575,48 +575,7 @@ const nl = {
             idin: "Idin",
             studielink: "Studielink",
             servicedesk: "Service Desk"
-        },
-        serviceDesk: {
-            confirmIdentityHeader: "Bevestig wie je bent met je identiteitsbewijs",
-            confirmIdentity: "Je kunt je identiteit ook bevestigen via een van onze eduID Service Desks.",
-            stepsHeader: "Volg deze stappen:",
-            step1: "Vul je volledige naam in zoals die op je identiteitsbewijs staat (voornamen en achternaam).",
-            step2: "Genereer een persoonlijke controlecode.",
-            step3: "Laat je controlecode en identiteitsbewijs zien aan een eduID Service Desk. Die bevestigt zo je identiteit.",
-            acceptedIds: "Geldige identiteitsbewijzen:",
-            passports: "paspoorten",
-            eea: "EEA<sup>*</sup> ID-kaarten",
-            driverLicense: "Nederlandse rijbewijzen",
-            residencePermit: "Nederlandse verblijfsvergunningen",
-            note: "Let op: kopieën, OV-kaarten en studentenkaarten zijn geen geldige identiteitsbewijzen.",
-            eeaNote: "<sup>*</sup>EEA: alle EU-lidstaten + Liechtenstein, Noorwegen en IJsland.",
-            next: "Naar gegevens invullen",
-            idCard: {
-                information: "Vul je gegevens in zoals die op je identiteitsbewijs staan.",
-                lastName: "Achternaam",
-                firstName: "Voornamen",
-                dayOfBirth: "Geboortedatum",
-                generateControlCode: "Genereer controlcode"
-            },
-            controlCode: {
-                controlCode: "Controlecode",
-                yourControlCode: "Je controlecode",
-                info: "Je krijgt ook een e-mail met deze code. De code is {{nbr}} dagen geldig en is bedoeld voor:",
-                typoPrefix: "Typfout gemaakt? ",
-                typoLink: "Pas gegevens aan",
-                todo: "Wat moet je nu doen?",
-                todoDetails: "Maak een afspraak met een eduID Service Desk (digitaal of op locatie). Laat tijdens je afspraak je controlecode en identiteisbewijs zien.",
-                serviceDesks: "Bekijk eduID Service Desks",
-                serviceDesksLocations: "https://wiki.surfnet.nl/display/EDUID/eduID+Service+Desk",
-                back: "Terug naar overzicht",
-                rethink: "Wil je toch op een andere manier bewijzen wie je bent? Verwijder dan eerst je controlecode.",
-                deleteControlCode: "Verwijder controlecode",
-                deletedControlCode: "Verificatie-code verwijderd",
-                banner: "Bevestig je identiteit bij een eduID Service Desk. Dit doe je door je identiteitsbewijs en controlecode te laten zien.",
-                showCode: "Toon code",
-                validityCode: "Je code is nog geldig voor {{nbr}} dagen."
-            }
-        },
+        }
     }
 };
 export default nl;
\ No newline at end of file
diff --git a/myconext-gui/src/routes/PersonalInfo.svelte b/myconext-gui/src/routes/PersonalInfo.svelte
index 5f5c2a16..5408de17 100644
--- a/myconext-gui/src/routes/PersonalInfo.svelte
+++ b/myconext-gui/src/routes/PersonalInfo.svelte
@@ -553,8 +553,8 @@
         {#if !eduIDLinked && isEmpty($user.linkedAccounts) && isEmpty($user.externalLinkedAccounts) && !isEmpty($user.controlCode)}
             <div class="banner expired">
                 <span class="verified-badge">{@html alertSvg}</span>
-                <p class="banner-info">{I18n.t("verify.serviceDesk.controlCode.banner")}</p>
-                <Button label={I18n.t("verify.serviceDesk.controlCode.showCode")}
+                <p class="banner-info">{I18n.t("ServiceDesk.ControlCode.Banner.COPY")}</p>
+                <Button label={I18n.t("ServiceDesk.ControlCode.ShowCode.COPY")}
                         className="ghost transparent"
                         onClick={() => showControlCode = true}/>
             </div>
@@ -659,7 +659,7 @@
 {#if showModal || showControlCode}
     <Modal close={() => resetModalsAndQueryParams()}
     title={showIdinOptions ? I18n.t("WelcomeToApp.VerifyYour.Highlight.COPY") : showControlCode ?
-    I18n.t("verify.serviceDesk.controlCode.controlCode") : I18n.t("Profile.AddAnOrganisation.COPY")}
+    I18n.t("ServiceDesk.ControlCode.ControlCode.COPY") : I18n.t("Profile.AddAnOrganisation.COPY")}
     showOptions={false}>
     <VerifyChoice addInstitution={addInstitution}
                   addBank={addBank}
diff --git a/myconext-gui/src/utils/services.js b/myconext-gui/src/utils/services.js
index c82ec7c0..8ea25fd5 100644
--- a/myconext-gui/src/utils/services.js
+++ b/myconext-gui/src/utils/services.js
@@ -4,54 +4,50 @@ import {isEmpty} from "./utils";
 import notFound from "../icons/school-building.svg?raw";
 
 export const serviceName = service => {
-  //backward compatibility with eduID has multiple services
-  if (I18n.currentLocale() === "en") {
-    return service.serviceName || service.name;
-  }
-  return service.serviceNameNl || service.serviceName || service.nameNl || service.name;
+    //backward compatibility with eduID has multiple services
+    if (I18n.currentLocale() === "en") {
+        return service.serviceName || service.name;
+    }
+    return service.serviceNameNl || service.serviceName || service.nameNl || service.name;
 }
 
 export const institutionLogo = institution => {
-  if (institution.external) {
-    return logo(institution.issuer)
-  }
-  if (!isEmpty(institution.LogoUrl)) {
-    return institution.LogoUrl;
-  }
-  return notFound;
+    if (institution.external) {
+        return logo(institution.issuer)
+    }
+    if (!isEmpty(institution.LogoUrl)) {
+        return institution.LogoUrl;
+    }
+    return notFound;
 
 }
 
 export const institutionName = linkedAccount => {
-  if (linkedAccount.external) {
-    const translation = I18n.translations[I18n.locale];
-    if (linkedAccount.issuer.name && translation.verify.issuers[linkedAccount.issuer.name.toLowerCase()]) {
-      return I18n.t(`verify.issuers.${linkedAccount.issuer.name.toLowerCase()}`);
+    if (linkedAccount.external) {
+        return I18n.t(`verify.issuers.${linkedAccount.issuer.name.toLowerCase()}`);
     }
-    return linkedAccount.issuer.name;
-  }
-  if (I18n.locale === "en") {
-    return linkedAccount.displayNameEn || linkedAccount.displayNameNl || linkedAccount.schacHomeOrganization;
-  }
-  return linkedAccount.displayNameNl || linkedAccount.displayNameEn || linkedAccount.schacHomeOrganization;
+    if (I18n.locale === "en") {
+        return linkedAccount.displayNameEn || linkedAccount.displayNameNl || linkedAccount.schacHomeOrganization;
+    }
+    return linkedAccount.displayNameNl || linkedAccount.displayNameEn || linkedAccount.schacHomeOrganization;
 }
 
 export const affiliation = linkedAccount => {
-  if (linkedAccount.external || isEmpty(linkedAccount.eduPersonAffiliations)) {
-    return null;
-  }
-  const eduPersonAffiliation = linkedAccount.eduPersonAffiliations[0];
-  return eduPersonAffiliation.substring(0, eduPersonAffiliation.indexOf("@"))
+    if (linkedAccount.external || isEmpty(linkedAccount.eduPersonAffiliations)) {
+        return null;
+    }
+    const eduPersonAffiliation = linkedAccount.eduPersonAffiliations[0];
+    return eduPersonAffiliation.substring(0, eduPersonAffiliation.indexOf("@"))
 }
 
 export const linkedAccountGivenName = linkedAccount => {
-  return linkedAccount.external ? linkedAccount.firstName : linkedAccount.givenName;
+    return linkedAccount.external ? linkedAccount.firstName : linkedAccount.givenName;
 }
 
 export const linkedAccountFamilyName = linkedAccount => {
-  return linkedAccount.external ? linkedAccount.legalLastName : linkedAccount.familyName;
+    return linkedAccount.external ? linkedAccount.legalLastName : linkedAccount.familyName;
 }
 
 export const isStudent = linkedAccount => {
-  return (linkedAccount.eduPersonAffiliations || []).some(aff => aff.toLowerCase().indexOf("student") > -1);
+    return (linkedAccount.eduPersonAffiliations || []).some(aff => aff.toLowerCase().indexOf("student") > -1);
 }
diff --git a/myconext-gui/src/verify/ServiceDesk.svelte b/myconext-gui/src/verify/ServiceDesk.svelte
index ad47ae7f..af96a59d 100644
--- a/myconext-gui/src/verify/ServiceDesk.svelte
+++ b/myconext-gui/src/verify/ServiceDesk.svelte
@@ -46,7 +46,7 @@
         deleteUserControlCode()
             .then(() => {
                 $user.controlCode = null;
-                flash.setValue(I18n.t("verify.serviceDesk.controlCode.deletedControlCode"));
+                flash.setValue(I18n.t("ServiceDesk.ControlCode.DeletedControlCode.COPY"));
                 cancelView();
             })
     }
@@ -217,101 +217,101 @@
             <span class="back" on:click={cancel} aria-label="toggle-view">
                 {@html arrowLeftIcon}
             </span>
-            <h2 class="header">{I18n.t("verify.serviceDesk.confirmIdentityHeader")}</h2>
+            <h2 class="header">{I18n.t("ServiceDesk.ConfirmIdentityHeader.COPY")}</h2>
         </div>
-        <p>{I18n.t("verify.serviceDesk.confirmIdentity")}</p>
-        <p class="steps">{I18n.t("verify.serviceDesk.stepsHeader")}</p>
+        <p>{I18n.t("ServiceDesk.ConfirmIdentity.COPY")}</p>
+        <p class="steps">{I18n.t("ServiceDesk.StepsHeader.COPY")}</p>
         <ol>
-            <li>{I18n.t("verify.serviceDesk.step1")}</li>
-            <li>{I18n.t("verify.serviceDesk.step2")}</li>
-            <li>{I18n.t("verify.serviceDesk.step3")}</li>
+            <li>{I18n.t("ServiceDesk.Step1.COPY")}</li>
+            <li>{I18n.t("ServiceDesk.Step2.COPY")}</li>
+            <li>{I18n.t("ServiceDesk.Step3.COPY")}</li>
         </ol>
         <div class="redirect">
             {@html alertSvg}
             <div class="content">
-                <span>{@html I18n.t("verify.serviceDesk.acceptedIds")}</span>
+                <span>{@html I18n.t("ServiceDesk.AcceptedIds.COPY")}</span>
                 <ul>
-                    <li>{@html I18n.t("verify.serviceDesk.passports")}</li>
-                    <li>{@html I18n.t("verify.serviceDesk.eea")}</li>
-                    <li>{@html I18n.t("verify.serviceDesk.driverLicense")}</li>
-                    <li>{@html I18n.t("verify.serviceDesk.residencePermit")}</li>
+                    <li>{@html I18n.t("ServiceDesk.Passports.COPY")}</li>
+                    <li>{@html I18n.t("ServiceDesk.Eea.COPY")}</li>
+                    <li>{@html I18n.t("ServiceDesk.DriverLicense.COPY")}</li>
+                    <li>{@html I18n.t("ServiceDesk.ResidencePermit.COPY")}</li>
                 </ul>
-                <p>{I18n.t("verify.serviceDesk.note")}</p>
-                <p class="eea-note">{@html I18n.t("verify.serviceDesk.eeaNote")}</p>
+                <p>{I18n.t("ServiceDesk.Note.COPY")}</p>
+                <p class="eea-note">{@html I18n.t("ServiceDesk.EeaNote.COPY")}</p>
             </div>
         </div>
-        <Button label={I18n.t("verify.serviceDesk.next")}
+        <Button label={I18n.t("ServiceDesk.Next.COPY")}
                 fullSize={true}
                 onClick={() => step = 1}/>
     {:else if step === 1}
         <div class="id-card-container">
             <span>{@html idCard}</span>
         </div>
-        <p>{I18n.t("verify.serviceDesk.idCard.information")}</p>
-        <label for="lastName">{I18n.t("verify.serviceDesk.idCard.lastName")}</label>
+        <p>{I18n.t("ServiceDesk.IdCard.Information.COPY")}</p>
+        <label for="lastName">{I18n.t("ServiceDesk.IdCard.LastName.COPY")}</label>
         <input id="lastName"
                type="text"
                use:init
                bind:value={lastName}/>
-        <label for="firstName">{I18n.t("verify.serviceDesk.idCard.firstName")}</label>
+        <label for="firstName">{I18n.t("ServiceDesk.IdCard.FirstName.COPY")}</label>
         <input id="firstName"
                type="text"
                bind:value={firstName}/>
-        <label for="dayOfBirth">{I18n.t("verify.serviceDesk.idCard.dayOfBirth")}</label>
+        <label for="dayOfBirth">{I18n.t("ServiceDesk.IdCard.DayOfBirth.COPY")}</label>
         <input id="dayOfBirth"
                type="text"
                bind:value={dayOfBirth}/>
-        <Button label={I18n.t("verify.serviceDesk.idCard.generateControlCode")}
+        <Button label={I18n.t("ServiceDesk.IdCard.GenerateControlCode.COPY")}
                 fullSize={true}
                 disabled={isEmpty(lastName) || isEmpty(firstName) || isEmpty(dayOfBirth)}
                 onClick={() => generateControlCode()}/>
     {:else if step === 2}
         <div>
-            <h3 class="header">{I18n.t("verify.serviceDesk.controlCode.yourControlCode")}</h3>
+            <h3 class="header">{I18n.t("ServiceDesk.ControlCode.YourControlCode.COPY")}</h3>
             <div class="control-code">
                 <span>{code}</span>
             </div>
-            <p>{I18n.t("verify.serviceDesk.controlCode.info", {nbr: verificationCodeValidityDays($user.controlCode)})}</p>
+            <p>{I18n.t("ServiceDesk.ControlCode.Info.COPY", {nbr: verificationCodeValidityDays($user.controlCode)})}</p>
             <div class="control-code">
-                <label for="lastName">{I18n.t("verify.serviceDesk.idCard.lastName")}</label>
+                <label for="lastName">{I18n.t("ServiceDesk.IdCard.LastName.COPY")}</label>
                 <input id="lastName"
                        type="text"
                        class="read-only"
                        disabled="true"
                        bind:value={lastName}/>
-                <label for="firstName">{I18n.t("verify.serviceDesk.idCard.firstName")}</label>
+                <label for="firstName">{I18n.t("ServiceDesk.IdCard.FirstName.COPY")}</label>
                 <input id="firstName"
                        type="text"
                        class="read-only"
                        disabled="true"
                        bind:value={firstName}/>
-                <label for="dayOfBirth">{I18n.t("verify.serviceDesk.idCard.dayOfBirth")}</label>
+                <label for="dayOfBirth">{I18n.t("ServiceDesk.IdCard.DayOfBirth.COPY")}</label>
                 <input id="dayOfBirth"
                        type="text"
                        class="read-only"
                        disabled="true"
                        bind:value={dayOfBirth}/>
                 <div class="rethink">
-                    <p>{I18n.t("verify.serviceDesk.controlCode.typoPrefix")}</p>
+                    <p>{I18n.t("ServiceDesk.ControlCode.TypoPrefix.COPY")}</p>
                     <a href="/#" on:click|preventDefault|stopPropagation={() => step = 1}>
-                        {I18n.t("verify.serviceDesk.controlCode.typoLink")}
+                        {I18n.t("ServiceDesk.ControlCode.TypoLink.COPY")}
                     </a>
 
                 </div>
             </div>
-            <p class="important">{I18n.t("verify.serviceDesk.controlCode.todo")}</p>
-            <p>{I18n.t("verify.serviceDesk.controlCode.todoDetails")}</p>
+            <p class="important">{I18n.t("ServiceDesk.ControlCode.Todo.COPY")}</p>
+            <p>{I18n.t("ServiceDesk.ControlCode.TodoDetails.COPY")}</p>
             <div class="button-container">
-                <Button label={I18n.t("verify.serviceDesk.controlCode.serviceDesks")}
+                <Button label={I18n.t("ServiceDesk.ControlCode.ServiceDesks.COPY")}
                         fullSize={true}
-                        onClick={() => window.open(I18n.t("verify.serviceDesk.controlCode.serviceDesksLocations"), "_blank").focus()}/>
-                <Button label={I18n.t("verify.serviceDesk.controlCode.back")}
+                        onClick={() => window.open(I18n.t("ServiceDesk.ControlCode.ServiceDesksLocations.COPY"), "_blank").focus()}/>
+                <Button label={I18n.t("ServiceDesk.ControlCode.Back.COPY")}
                         fullSize={true}
                         className="cancel"
                         onClick={backToPersonal}/>
             </div>
-            <p>{I18n.t("verify.serviceDesk.controlCode.rethink")}</p>
-            <Button label={I18n.t("verify.serviceDesk.controlCode.deleteControlCode")}
+            <p>{I18n.t("ServiceDesk.ControlCode.Rethink.COPY")}</p>
+            <Button label={I18n.t("ServiceDesk.ControlCode.DeleteControlCode.COPY")}
                     fullSize={true}
                     deleteAction={true}
                     onClick={deleteControlCode}/>