Localized ServiceDesk in new I18n

OpenConext · Jan 27, 2025 · 41592c9 · 41592c9
1 parent 6ef8c38
commit 41592c9
Show file tree

Hide file tree

Showing 14 changed files with 181 additions and 203 deletions.
diff --git a/account-gui/src/locale/I18n.js b/account-gui/src/locale/I18n.js
@@ -12,20 +12,18 @@ 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;
 };
 
 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
@@ -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
@@ -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"
+
+}
diff --git 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
@@ -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;
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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."
+
+
 }