From 90ea40971c965ef5b7341cdd00f350769b120c31 Mon Sep 17 00:00:00 2001
From: monsieurswag <mael.joumier@intuitem.com>
Date: Wed, 16 Oct 2024 11:28:45 +0200
Subject: [PATCH 01/14] Change localItems usage to safeTranslate usage

---
 .../lib/components/Chart/RadarChart.svelte    |  5 +--
 .../Forms/AutocompleteSelect.svelte           |  7 ++--
 .../Modals/MissingConstraintsModal.svelte     |  6 +--
 .../components/ModelTable/ModelTable.svelte   | 10 ++---
 frontend/src/lib/utils/constants.ts           |  2 -
 .../[id=uuid]/+page.server.ts                 |  9 +++--
 .../(app)/(internal)/analytics/+page.svelte   |  4 +-
 .../analytics/composer/+page.svelte           |  3 --
 .../frameworks/[id=uuid]/+page.svelte         |  5 ++-
 .../(internal)/libraries/+page.server.ts      |  4 +-
 .../libraries/[id=uuid]/+page.server.ts       |  3 +-
 .../(app)/(internal)/my-profile/+page.svelte  |  4 +-
 .../risk-assessments/[id=uuid]/+page.svelte   |  5 ++-
 .../risk-scenarios/[id=uuid]/+page.svelte     | 39 ++++++++++---------
 .../[id=uuid]/edit/+page.svelte               |  5 ++-
 .../[id=uuid]/edit/RiskLevel.svelte           |  7 ++--
 .../scoring-assistant/selector.svelte         |  7 ++--
 .../(app)/(internal)/x-rays/+page.svelte      | 14 +++----
 .../+page.server.ts                           |  2 -
 .../[id=uuid]/+page.svelte                    |  9 +++--
 .../evidences/[id=uuid]/+page.svelte          |  5 ++-
 .../[id=uuid]/edit/+page.svelte               |  7 ++--
 frontend/tests/functional/nav.test.ts         |  3 +-
 23 files changed, 83 insertions(+), 82 deletions(-)

diff --git a/frontend/src/lib/components/Chart/RadarChart.svelte b/frontend/src/lib/components/Chart/RadarChart.svelte
index 87620fdd8..8300a450b 100644
--- a/frontend/src/lib/components/Chart/RadarChart.svelte
+++ b/frontend/src/lib/components/Chart/RadarChart.svelte
@@ -1,7 +1,6 @@
 <script lang="ts">
 	import { onMount } from 'svelte';
-	import { localItems } from '$lib/utils/locales';
-	import { languageTag } from '$paraglide/runtime';
+	import { safeTranslate } from '$lib/utils/i18n';
 
 	// export let name: string;
 	export let s_label = '';
@@ -17,7 +16,7 @@
 
 	for (const index in values) {
 		if (values[index].localName) {
-			values[index].name = localItems()[values[index].localName];
+			values[index].name = safeTranslate(values[index].localName);
 		}
 	}
 
diff --git a/frontend/src/lib/components/Forms/AutocompleteSelect.svelte b/frontend/src/lib/components/Forms/AutocompleteSelect.svelte
index 62f09f517..1162bf5b3 100644
--- a/frontend/src/lib/components/Forms/AutocompleteSelect.svelte
+++ b/frontend/src/lib/components/Forms/AutocompleteSelect.svelte
@@ -1,6 +1,7 @@
 <script lang="ts">
 	import { formFieldProxy } from 'sveltekit-superforms';
-	import { localItems, toCamelCase } from '$lib/utils/locales';
+	import { toCamelCase } from '$lib/utils/locales';
+	import { safeTranslate } from '$lib/utils/i18n';
 	import type { CacheLock } from '$lib/utils/types';
 	import { onMount } from 'svelte';
 
@@ -120,8 +121,8 @@
 				{#if option.suggested}
 					<span class="text-indigo-600">{option.label}</span>
 					<span class="text-sm text-gray-500"> (suggested)</span>
-				{:else if translateOptions && localItems()[toCamelCase(option.label)]}
-					{localItems()[toCamelCase(option.label)]}
+				{:else if translateOptions && safeTranslate(toCamelCase(option.label))}
+					{safeTranslate(toCamelCase(option.label))}
 				{:else}
 					{option.label}
 				{/if}
diff --git a/frontend/src/lib/components/Modals/MissingConstraintsModal.svelte b/frontend/src/lib/components/Modals/MissingConstraintsModal.svelte
index 78341f5c5..ccaa28933 100644
--- a/frontend/src/lib/components/Modals/MissingConstraintsModal.svelte
+++ b/frontend/src/lib/components/Modals/MissingConstraintsModal.svelte
@@ -7,8 +7,8 @@
 	import type { ModalStore } from '@skeletonlabs/skeleton';
 	import { getModalStore } from '@skeletonlabs/skeleton';
 	import * as m from '$paraglide/messages';
-	import { localItems, toCamelCase } from '$lib/utils/locales';
-	import { languageTag } from '$paraglide/runtime';
+	import { toCamelCase } from '$lib/utils/locales';
+	import { safeTranslate } from '$lib/utils/i18n';
 
 	const modalStore: ModalStore = getModalStore();
 
@@ -28,7 +28,7 @@
 			{#if value}
 				{m.missingMandatoyObjects1({ model: $modalStore[0].body })}:
 				{#each value as key}
-					<li class="font-bold">{localItems()[toCamelCase(key)]}</li>
+					<li class="font-bold">{safeTranslate(toCamelCase(key))}</li>
 				{/each}
 				{m.missingMandatoyObjects2()}.
 			{/if}
diff --git a/frontend/src/lib/components/ModelTable/ModelTable.svelte b/frontend/src/lib/components/ModelTable/ModelTable.svelte
index f589ac40c..c91aafb5f 100644
--- a/frontend/src/lib/components/ModelTable/ModelTable.svelte
+++ b/frontend/src/lib/components/ModelTable/ModelTable.svelte
@@ -18,7 +18,7 @@
 	import type { AnyZodObject } from 'zod';
 	import type { TableSource } from './types';
 	import * as m from '$paraglide/messages';
-	import { localItems, toCamelCase } from '$lib/utils/locales';
+	import { toCamelCase } from '$lib/utils/locales';
 	import { languageTag } from '$paraglide/runtime';
 	import { ISO_8601_REGEX } from '$lib/utils/constants';
 	// Event Dispatcher
@@ -368,8 +368,8 @@
                   {/if}
                 {:else if value && value.hexcolor}
                   <p class="flex w-fit min-w-24 justify-center px-2 py-1 rounded-md ml-2 whitespace-nowrap {classesHexBackgroundText(value.hexcolor)}" style="background-color: {value.hexcolor}">
-                    {#if localItems()[toCamelCase(value.name ?? value.str ?? '-')]}
-                      {localItems()[toCamelCase(value.name ?? value.str ?? '-')]}
+                    {#if safeTranslate(toCamelCase(value.name ?? value.str ?? '-'))}
+                      {safeTranslate(toCamelCase(value.name ?? value.str ?? '-'))}
                     {:else}
                       {value.name ?? value.str ?? '-'}
                     {/if}
@@ -377,8 +377,8 @@
 				{:else if ISO_8601_REGEX.test(value)}
 									{formatDateOrDateTime(value, languageTag())}
                 {:else}
-					{#if localItems()[toCamelCase(value)]}
-						{localItems()[toCamelCase(value)]}
+					{#if safeTranslate(toCamelCase(value))}
+						{safeTranslate(toCamelCase(value))}
 					{:else}
 						{value ?? '-'}
 					{/if}
diff --git a/frontend/src/lib/utils/constants.ts b/frontend/src/lib/utils/constants.ts
index 7da95f5a8..ccd6240f8 100644
--- a/frontend/src/lib/utils/constants.ts
+++ b/frontend/src/lib/utils/constants.ts
@@ -12,8 +12,6 @@ export const BACKEND_API_EXPOSED_URL = `${
 		: BASE_API_URL
 }`;
 
-export const RISK_COLOR_PALETTE: string[] = ['#BBF7D0', '#BEF264', '#FEF08A', '#FBBF24', '#F87171'];
-
 export const complianceResultColorMap: { [key: string]: string } = {
 	not_assessed: '#d1d5db',
 	partially_compliant: '#fde047',
diff --git a/frontend/src/routes/(app)/(internal)/[model=urlmodel]/[id=uuid]/+page.server.ts b/frontend/src/routes/(app)/(internal)/[model=urlmodel]/[id=uuid]/+page.server.ts
index a7ed99579..06243768c 100644
--- a/frontend/src/routes/(app)/(internal)/[model=urlmodel]/[id=uuid]/+page.server.ts
+++ b/frontend/src/routes/(app)/(internal)/[model=urlmodel]/[id=uuid]/+page.server.ts
@@ -1,7 +1,8 @@
 import { BASE_API_URL } from '$lib/utils/constants';
 import { getModelInfo, urlParamModelVerboseName } from '$lib/utils/crud';
 
-import { localItems, toCamelCase } from '$lib/utils/locales';
+import { toCamelCase } from '$lib/utils/locales';
+import { safeTranslate } from '$lib/utils/i18n';
 import * as m from '$paraglide/messages';
 
 import { fail, type Actions } from '@sveltejs/kit';
@@ -53,7 +54,7 @@ export const actions: Actions = {
 		return message(
 			rejectForm,
 			m.successfullyRejectedObject({
-				object: localItems()[toCamelCase(model.toLowerCase())].toLowerCase(),
+				object: safeTranslate(toCamelCase(model.toLowerCase())).toLowerCase(),
 				id: id
 			})
 		);
@@ -87,7 +88,7 @@ export const actions: Actions = {
 		return message(
 			acceptForm,
 			m.successfullyValidatedObject({
-				object: localItems()[toCamelCase(model.toLowerCase())].toLowerCase(),
+				object: safeTranslate(toCamelCase(model.toLowerCase())).toLowerCase(),
 				id: id
 			})
 		);
@@ -121,7 +122,7 @@ export const actions: Actions = {
 		return message(
 			revokeForm,
 			m.successfullyRevokedObject({
-				object: localItems()[toCamelCase(model.toLowerCase())].toLowerCase(),
+				object: safeTranslate(toCamelCase(model.toLowerCase())).toLowerCase(),
 				id: id
 			})
 		);
diff --git a/frontend/src/routes/(app)/(internal)/analytics/+page.svelte b/frontend/src/routes/(app)/(internal)/analytics/+page.svelte
index f35dd40e3..cca3ca306 100644
--- a/frontend/src/routes/(app)/(internal)/analytics/+page.svelte
+++ b/frontend/src/routes/(app)/(internal)/analytics/+page.svelte
@@ -11,7 +11,7 @@
 	import Card from '$lib/components/DataViz/Card.svelte';
 	import ModelTable from '$lib/components/ModelTable/ModelTable.svelte';
 	import type { TableSource } from '$lib/components/ModelTable/types';
-	import { localItems } from '$lib/utils/locales.js';
+	import { safeTranslate } from '$lib/utils/i18n';
 	import * as m from '$paraglide/messages';
 	import { languageTag } from '$paraglide/runtime';
 	import { ProgressRadial, Tab, TabGroup, tableSourceMapper } from '@skeletonlabs/skeleton';
@@ -39,7 +39,7 @@
 	const rsd_rsk_label = m.residualRisk();
 
 	function localizeChartLabels(labels: string[]): string[] {
-		return labels.map((label) => localItems()[label]);
+		return labels.map((label) => safeTranslate(label));
 	}
 
 	const appliedControlTodoTable: TableSource = {
diff --git a/frontend/src/routes/(app)/(internal)/analytics/composer/+page.svelte b/frontend/src/routes/(app)/(internal)/analytics/composer/+page.svelte
index 9fe000045..c60f7ca46 100644
--- a/frontend/src/routes/(app)/(internal)/analytics/composer/+page.svelte
+++ b/frontend/src/routes/(app)/(internal)/analytics/composer/+page.svelte
@@ -2,10 +2,7 @@
 	import DonutChart from '$lib/components/Chart/DonutChart.svelte';
 	import BarChart from '$lib/components/Chart/BarChart.svelte';
 	import * as m from '$paraglide/messages';
-	import { localItems } from '$lib/utils/locales';
-	import { languageTag } from '$paraglide/runtime';
 	import type { AppliedControlStatus } from '$lib/utils/types';
-	import { RISK_COLOR_PALETTE } from '$lib/utils/constants.js';
 
 	export let data;
 	data.risk_assessment_objects.forEach((risk_assessment: Record<string, any>) => {
diff --git a/frontend/src/routes/(app)/(internal)/frameworks/[id=uuid]/+page.svelte b/frontend/src/routes/(app)/(internal)/frameworks/[id=uuid]/+page.svelte
index dc49df3d8..9a824d52b 100644
--- a/frontend/src/routes/(app)/(internal)/frameworks/[id=uuid]/+page.svelte
+++ b/frontend/src/routes/(app)/(internal)/frameworks/[id=uuid]/+page.svelte
@@ -6,7 +6,8 @@
 	import { breadcrumbObject } from '$lib/utils/stores';
 	import { URL_MODEL_MAP } from '$lib/utils/crud';
 	import * as m from '$paraglide/messages';
-	import { localItems, toCamelCase } from '$lib/utils/locales';
+	import { toCamelCase } from '$lib/utils/locales';
+	import { safeTranslate } from '$lib/utils/i18n';
 
 	export let data: PageData;
 	breadcrumbObject.set(data.framework);
@@ -48,7 +49,7 @@
 						{#if key === 'urn'}
 							{m.urn()}
 						{:else}
-							{localItems()[toCamelCase(key)]}
+							{safeTranslate(toCamelCase(key))}
 						{/if}
 					</div>
 					<ul class="text-sm">
diff --git a/frontend/src/routes/(app)/(internal)/libraries/+page.server.ts b/frontend/src/routes/(app)/(internal)/libraries/+page.server.ts
index e6b9b557b..d69ed6ac5 100644
--- a/frontend/src/routes/(app)/(internal)/libraries/+page.server.ts
+++ b/frontend/src/routes/(app)/(internal)/libraries/+page.server.ts
@@ -11,7 +11,7 @@ import { tableSourceMapper } from '@skeletonlabs/skeleton';
 import { listViewFields } from '$lib/utils/table';
 import type { Library } from '$lib/utils/types';
 import * as m from '$paraglide/messages';
-import { localItems } from '$lib/utils/locales';
+import { safeTranslate } from '$lib/utils/i18n';
 import { nestedDeleteFormAction } from '$lib/utils/actions';
 
 export const load = (async ({ fetch }) => {
@@ -95,7 +95,7 @@ export const actions: Actions = {
 				const response = await req.json();
 				console.error(response);
 
-				const translate_error = localItems()[response.error];
+				const translate_error = safeTranslate(response.error);
 				const toast_error_message =
 					translate_error ?? m.libraryLoadingError() + '(' + response.error + ')';
 
diff --git a/frontend/src/routes/(app)/(internal)/libraries/[id=uuid]/+page.server.ts b/frontend/src/routes/(app)/(internal)/libraries/[id=uuid]/+page.server.ts
index bad6a1d6c..b9d49de3e 100644
--- a/frontend/src/routes/(app)/(internal)/libraries/[id=uuid]/+page.server.ts
+++ b/frontend/src/routes/(app)/(internal)/libraries/[id=uuid]/+page.server.ts
@@ -1,6 +1,5 @@
 import { BASE_API_URL } from '$lib/utils/constants';
 import { safeTranslate } from '$lib/utils/i18n';
-import { localItems } from '$lib/utils/locales';
 import * as m from '$paraglide/messages';
 import { fail, type Actions } from '@sveltejs/kit';
 import { setFlash } from 'sveltekit-flash-message/server';
@@ -32,7 +31,7 @@ export const actions: Actions = {
 			setFlash(
 				{
 					type: 'error',
-					message: localItems()[resText]
+					message: safeTranslate(resText)
 				},
 				event
 			);
diff --git a/frontend/src/routes/(app)/(internal)/my-profile/+page.svelte b/frontend/src/routes/(app)/(internal)/my-profile/+page.svelte
index f81383328..b61da5bbf 100644
--- a/frontend/src/routes/(app)/(internal)/my-profile/+page.svelte
+++ b/frontend/src/routes/(app)/(internal)/my-profile/+page.svelte
@@ -2,7 +2,7 @@
 	import { page } from '$app/stores';
 	import * as m from '$paraglide/messages';
 	import { toCamelCase } from '$lib/utils/locales';
-	import { localItems } from '$lib/utils/locales';
+	import { safeTranslate } from '$lib/utils/i18n';
 	import { languageTag } from '$paraglide/runtime';
 
 	function filterUserData() {
@@ -46,7 +46,7 @@
 		<div class="flex flex-col w-1/2 border p-2 rounded-lg shadow-lg space-y-4">
 			{#each Object.entries(filterUserData()) as [label, value]}
 				<div class="flex flex-col">
-					<p class="font-semibold text-sm">{localItems()[label]}</p>
+					<p class="font-semibold text-sm">{safeTranslate(label)}</p>
 					<p class="text-sm">{value}</p>
 				</div>
 			{/each}
diff --git a/frontend/src/routes/(app)/(internal)/risk-assessments/[id=uuid]/+page.svelte b/frontend/src/routes/(app)/(internal)/risk-assessments/[id=uuid]/+page.svelte
index 8c2b0f447..57e0792f2 100644
--- a/frontend/src/routes/(app)/(internal)/risk-assessments/[id=uuid]/+page.svelte
+++ b/frontend/src/routes/(app)/(internal)/risk-assessments/[id=uuid]/+page.svelte
@@ -19,7 +19,8 @@
 	import RiskScenarioItem from '$lib/components/RiskMatrix/RiskScenarioItem.svelte';
 	import * as m from '$paraglide/messages';
 	import { languageTag } from '$paraglide/runtime';
-	import { localItems, toCamelCase } from '$lib/utils/locales.js';
+	import { toCamelCase } from '$lib/utils/locales.js';
+	import { safeTranslate } from '$lib/utils/i18n.js';
 
 	export let data;
 	const showRisks = true;
@@ -165,7 +166,7 @@
 							<span class="font-semibold">{m.status()}:</span>
 							{risk_assessment.status === null
 								? '--'
-								: localItems()[toCamelCase(risk_assessment.status)]}
+								: safeTranslate(toCamelCase(risk_assessment.status))}
 						</li>
 						<li class="pb-1">
 							<span class="font-semibold">{m.authors()}:</span>
diff --git a/frontend/src/routes/(app)/(internal)/risk-scenarios/[id=uuid]/+page.svelte b/frontend/src/routes/(app)/(internal)/risk-scenarios/[id=uuid]/+page.svelte
index a7d393628..7b7628504 100644
--- a/frontend/src/routes/(app)/(internal)/risk-scenarios/[id=uuid]/+page.svelte
+++ b/frontend/src/routes/(app)/(internal)/risk-scenarios/[id=uuid]/+page.svelte
@@ -6,7 +6,8 @@
 
 	import * as m from '$paraglide/messages';
 	import { languageTag } from '$paraglide/runtime';
-	import { localItems, toCamelCase } from '$lib/utils/locales';
+	import { toCamelCase } from '$lib/utils/locales';
+	import { safeTranslate } from '$lib/utils/i18n';
 
 	import ModelTable from '$lib/components/ModelTable/ModelTable.svelte';
 	import { isDark } from '$lib/utils/helpers';
@@ -99,7 +100,7 @@
 				<div>
 					<p class="text-sm font-semibold text-gray-400">{m.treatmentStatus()}</p>
 					<p class="text-sm font-semibold">
-						{localItems()[toCamelCase(data.scenario.treatment)]}
+						{safeTranslate(toCamelCase(data.scenario.treatment))}
 					</p>
 				</div>
 			</div>
@@ -134,8 +135,8 @@
 					class="text-sm text-center font-semibold p-2 rounded-md w-20"
 					style="background-color: {color_map[data.scenario.current_proba]}"
 				>
-					{#if localItems()[toCamelCase(data.scenario.current_proba.name)]}
-						{localItems()[toCamelCase(data.scenario.current_proba.name)]}
+					{#if safeTranslate(toCamelCase(data.scenario.current_proba.name))}
+						{safeTranslate(toCamelCase(data.scenario.current_proba.name))}
 					{:else}
 						{data.scenario.current_proba.name}
 					{/if}
@@ -148,8 +149,8 @@
 					class="text-sm text-center font-semibold p-2 rounded-md w-20"
 					style="background-color: {color_map[data.scenario.current_impact]}"
 				>
-					{#if localItems()[toCamelCase(data.scenario.current_impact.name)]}
-						{localItems()[toCamelCase(data.scenario.current_impact.name)]}
+					{#if safeTranslate(toCamelCase(data.scenario.current_impact.name))}
+						{safeTranslate(toCamelCase(data.scenario.current_impact.name))}
 					{:else}
 						{data.scenario.current_impact.name}
 					{/if}
@@ -166,8 +167,8 @@
 					)}"
 					style="background-color: {data.scenario.current_level.hexcolor}"
 				>
-					{#if localItems()[toCamelCase(data.scenario.current_level.name)]}
-						{localItems()[toCamelCase(data.scenario.current_level.name)]}
+					{#if safeTranslate(toCamelCase(data.scenario.current_level.name))}
+						{safeTranslate(toCamelCase(data.scenario.current_level.name))}
 					{:else}
 						{data.scenario.current_level.name}
 					{/if}
@@ -192,8 +193,8 @@
 					class="text-sm text-center font-semibold p-2 rounded-md w-20"
 					style="background-color: {color_map[data.scenario.residual_proba]}"
 				>
-					{#if localItems()[toCamelCase(data.scenario.residual_proba.name)]}
-						{localItems()[toCamelCase(data.scenario.residual_proba.name)]}
+					{#if safeTranslate(toCamelCase(data.scenario.residual_proba.name))}
+						{safeTranslate(toCamelCase(data.scenario.residual_proba.name))}
 					{:else}
 						{data.scenario.residual_proba.name}
 					{/if}
@@ -206,8 +207,8 @@
 					class="text-sm text-center font-semibold p-2 rounded-md w-20"
 					style="background-color: {color_map[data.scenario.residual_impact]}"
 				>
-					{#if localItems()[toCamelCase(data.scenario.residual_impact.name)]}
-						{localItems()[toCamelCase(data.scenario.residual_impact.name)]}
+					{#if safeTranslate(toCamelCase(data.scenario.residual_impact.name))}
+						{safeTranslate(toCamelCase(data.scenario.residual_impact.name))}
 					{:else}
 						{data.scenario.residual_impact.name}
 					{/if}
@@ -224,8 +225,8 @@
 					)}"
 					style="background-color: {data.scenario.residual_level.hexcolor}"
 				>
-					{#if localItems()[toCamelCase(data.scenario.residual_level.name)]}
-						{localItems()[toCamelCase(data.scenario.residual_level.name)]}
+					{#if safeTranslate(toCamelCase(data.scenario.residual_level.name))}
+						{safeTranslate(toCamelCase(data.scenario.residual_level.name))}
 					{:else}
 						{data.scenario.residual_level.name}
 					{/if}
@@ -240,7 +241,9 @@
 				<span class="font-semibold">
 					{#each data.scenario.qualifications as qualification, i}
 						{#if i > 0},{/if}
-						{localItems()[toCamelCase(qualification)] || qualification || localItems()['undefined']}
+						{safeTranslate(toCamelCase(qualification)) ||
+							qualification ||
+							safeTranslate('undefined')}
 					{/each}
 				</span>
 			</p>
@@ -252,10 +255,10 @@
 					{data.scenario.strength_of_knowledge.symbol}
 				{/if}
 				<span class="font-semibold">
-					{#if localItems()[toCamelCase(data.scenario.strength_of_knowledge.name)]}
-						{localItems()[toCamelCase(data.scenario.strength_of_knowledge.name)]}
+					{#if safeTranslate(toCamelCase(data.scenario.strength_of_knowledge.name))}
+						{safeTranslate(toCamelCase(data.scenario.strength_of_knowledge.name))}
 					{:else}
-						{localItems()['undefined']}
+						{safeTranslate('undefined')}
 					{/if}
 				</span>
 			</p>
diff --git a/frontend/src/routes/(app)/(internal)/risk-scenarios/[id=uuid]/edit/+page.svelte b/frontend/src/routes/(app)/(internal)/risk-scenarios/[id=uuid]/edit/+page.svelte
index 784dd24cf..bd6c902e9 100644
--- a/frontend/src/routes/(app)/(internal)/risk-scenarios/[id=uuid]/edit/+page.svelte
+++ b/frontend/src/routes/(app)/(internal)/risk-scenarios/[id=uuid]/edit/+page.svelte
@@ -27,7 +27,8 @@
 	import { page } from '$app/stores';
 
 	import * as m from '$paraglide/messages';
-	import { localItems, capitalizeFirstLetter, toCamelCase } from '$lib/utils/locales';
+	import { capitalizeFirstLetter } from '$lib/utils/locales';
+	import { safeTranslate } from '$lib/utils/i18n';
 	import { languageTag } from '$paraglide/runtime';
 	import { zod } from 'sveltekit-superforms/adapters';
 
@@ -72,7 +73,7 @@
 			type: 'component',
 			component: modalComponent,
 			// Data
-			title: localItems()['add' + capitalizeFirstLetter(data.measureModel.localName)]
+			title: safeTranslate('add' + capitalizeFirstLetter(data.measureModel.localName))
 		};
 		modalStore.trigger(modal);
 	}
diff --git a/frontend/src/routes/(app)/(internal)/risk-scenarios/[id=uuid]/edit/RiskLevel.svelte b/frontend/src/routes/(app)/(internal)/risk-scenarios/[id=uuid]/edit/RiskLevel.svelte
index bc321d4c9..ecdba0cca 100644
--- a/frontend/src/routes/(app)/(internal)/risk-scenarios/[id=uuid]/edit/RiskLevel.svelte
+++ b/frontend/src/routes/(app)/(internal)/risk-scenarios/[id=uuid]/edit/RiskLevel.svelte
@@ -2,7 +2,8 @@
 	import type { RiskMatrixJsonDefinition } from '$lib/utils/types';
 	import { formFieldProxy } from 'sveltekit-superforms';
 
-	import { localItems, toCamelCase } from '$lib/utils/locales';
+	import { toCamelCase } from '$lib/utils/locales';
+	import { safeTranslate } from '$lib/utils/i18n';
 	import { isDark } from '$lib/utils/helpers';
 
 	export let label: string | undefined = undefined;
@@ -60,8 +61,8 @@
 			)}"
 			style="background-color: {riskLevel.hexcolor}"
 		>
-			{#if localItems()[toCamelCase(riskLevel.name)]}
-				{localItems()[toCamelCase(riskLevel.name)]}
+			{#if safeTranslate(toCamelCase(riskLevel.name))}
+				{safeTranslate(toCamelCase(riskLevel.name))}
 			{:else}
 				{riskLevel.name}
 			{/if}
diff --git a/frontend/src/routes/(app)/(internal)/scoring-assistant/selector.svelte b/frontend/src/routes/(app)/(internal)/scoring-assistant/selector.svelte
index f7869385a..f40f455f3 100644
--- a/frontend/src/routes/(app)/(internal)/scoring-assistant/selector.svelte
+++ b/frontend/src/routes/(app)/(internal)/scoring-assistant/selector.svelte
@@ -1,7 +1,6 @@
 <script lang="ts">
 	import { createEventDispatcher } from 'svelte';
-	import { localItems } from '$lib/utils/locales';
-	import { languageTag } from '$paraglide/runtime';
+	import { safeTranslate } from '$lib/utils/i18n';
 
 	export let text: string;
 	export let id: string;
@@ -14,12 +13,12 @@
 	$: dispatch('change', value);
 </script>
 
-<div>{localItems()[text]}</div>
+<div>{safeTranslate(text)}</div>
 <select class="select w-full" {id} bind:value {disabled}>
 	{#each choices as text, i}
 		<option class="text-{i}" value={i}
 			>{i}{#if text}
-				- {localItems()[text]}{/if}</option
+				- {safeTranslate(text)}{/if}</option
 		>
 	{/each}
 </select>
diff --git a/frontend/src/routes/(app)/(internal)/x-rays/+page.svelte b/frontend/src/routes/(app)/(internal)/x-rays/+page.svelte
index f099071c6..641d8c88a 100644
--- a/frontend/src/routes/(app)/(internal)/x-rays/+page.svelte
+++ b/frontend/src/routes/(app)/(internal)/x-rays/+page.svelte
@@ -2,7 +2,7 @@
 	import { Tab, TabGroup } from '@skeletonlabs/skeleton';
 	import type { PageData } from './$types';
 	import * as m from '$paraglide/messages';
-	import { localItems } from '$lib/utils/locales';
+	import { safeTranslate } from '$lib/utils/i18n';
 	export let data: PageData;
 
 	const aggregateQualityChecks = (item: any) => {
@@ -117,7 +117,7 @@
 														{#if error.object.name}<a class="anchor" href={error.link}
 																>{error.object.name}</a
 															>:{/if}
-														{localItems()[error.msgid]}
+														{safeTranslate(error.msgid)}
 													</li>
 												{/each}
 											</ul>
@@ -141,7 +141,7 @@
 														{#if warning.object.name}
 															<a class="anchor" href={warning.link}>{warning.object.name}</a>:
 														{/if}
-														{localItems()[warning.msgid]}
+														{safeTranslate(warning.msgid)}
 													</li>
 												{/each}
 											</ul>
@@ -165,7 +165,7 @@
 														{#if info.object.name}<a class="anchor" href={info.link}
 																>{info.object.name}</a
 															>:{/if}
-														{localItems()[info.msgid]}
+														{safeTranslate(info.msgid)}
 													</li>
 												{/each}
 											</ul>
@@ -207,7 +207,7 @@
 														{#if error.object.name}<a class="anchor" href={error.link}
 																>{error.object.name}</a
 															>:{/if}
-														{localItems()[error.msgid]}
+														{safeTranslate(error.msgid)}
 													</li>
 												{/each}
 											</ul>
@@ -231,7 +231,7 @@
 														{#if warning.object.name}<a class="anchor" href={warning.link}
 																>{warning.object.name}</a
 															>:{/if}
-														{localItems()[warning.msgid]}
+														{safeTranslate(warning.msgid)}
 													</li>
 												{/each}
 											</ul>
@@ -255,7 +255,7 @@
 														{#if info.object.name}<a class="anchor" href={info.link}
 																>{info.object.name}</a
 															>:{/if}
-														{localItems()[info.msgid]}
+														{safeTranslate(info.msgid)}
 													</li>
 												{/each}
 											</ul>
diff --git a/frontend/src/routes/(app)/(third-party)/[model=thirdparty_urlmodels]/+page.server.ts b/frontend/src/routes/(app)/(third-party)/[model=thirdparty_urlmodels]/+page.server.ts
index fdfe3c5e5..174765ed0 100644
--- a/frontend/src/routes/(app)/(third-party)/[model=thirdparty_urlmodels]/+page.server.ts
+++ b/frontend/src/routes/(app)/(third-party)/[model=thirdparty_urlmodels]/+page.server.ts
@@ -5,8 +5,6 @@ import {
 	urlParamModelSelectFields,
 	urlParamModelVerboseName
 } from '$lib/utils/crud';
-import { safeTranslate } from '$lib/utils/i18n';
-import { localItems } from '$lib/utils/locales';
 import { modelSchema } from '$lib/utils/schemas';
 import type { ModelInfo } from '$lib/utils/types';
 import * as m from '$paraglide/messages';
diff --git a/frontend/src/routes/(app)/(third-party)/compliance-assessments/[id=uuid]/+page.svelte b/frontend/src/routes/(app)/(third-party)/compliance-assessments/[id=uuid]/+page.svelte
index ddcd3faa7..79fb6c824 100644
--- a/frontend/src/routes/(app)/(third-party)/compliance-assessments/[id=uuid]/+page.svelte
+++ b/frontend/src/routes/(app)/(third-party)/compliance-assessments/[id=uuid]/+page.svelte
@@ -26,7 +26,8 @@
 	import { URL_MODEL_MAP } from '$lib/utils/crud';
 	import type { Node } from './types';
 
-	import { localItems, toCamelCase } from '$lib/utils/locales';
+	import { toCamelCase } from '$lib/utils/locales';
+	import { safeTranslate } from '$lib/utils/i18n';
 	import * as m from '$paraglide/messages';
 
 	export let data: PageData;
@@ -202,7 +203,7 @@
 						{#if key === 'urn'}
 							{m.urn()}
 						{:else}
-							{localItems()[toCamelCase(key)]}
+							{safeTranslate(toCamelCase(key))}
 						{/if}
 					</div>
 					<ul class="text-sm">
@@ -243,8 +244,8 @@
 									{:else}
 										{value.str}
 									{/if}
-								{:else if localItems()[toCamelCase(value.str ?? value)]}
-									{localItems()[toCamelCase(value.str ?? value)]}
+								{:else if safeTranslate(toCamelCase(value.str ?? value))}
+									{safeTranslate(toCamelCase(value.str ?? value))}
 								{:else}
 									{value.str ?? value}
 								{/if}
diff --git a/frontend/src/routes/(app)/(third-party)/evidences/[id=uuid]/+page.svelte b/frontend/src/routes/(app)/(third-party)/evidences/[id=uuid]/+page.svelte
index cb6a387f7..39ed28236 100644
--- a/frontend/src/routes/(app)/(third-party)/evidences/[id=uuid]/+page.svelte
+++ b/frontend/src/routes/(app)/(third-party)/evidences/[id=uuid]/+page.svelte
@@ -12,7 +12,8 @@
 	import ModelTable from '$lib/components/ModelTable/ModelTable.svelte';
 
 	import * as m from '$paraglide/messages';
-	import { localItems, toCamelCase } from '$lib/utils/locales';
+	import { toCamelCase } from '$lib/utils/locales';
+	import { safeTranslate } from '$lib/utils/i18n';
 	import { languageTag } from '$paraglide/runtime';
 
 	export let data: PageData;
@@ -72,7 +73,7 @@
 						class="text-sm font-medium text-gray-800 capitalize-first"
 						data-testid={key.replace('_', '-') + '-field-title'}
 					>
-						{localItems()[toCamelCase(key)]}
+						{safeTranslate(toCamelCase(key))}
 					</div>
 					<ul class="text-sm">
 						<li
diff --git a/frontend/src/routes/(app)/(third-party)/requirement-assessments/[id=uuid]/edit/+page.svelte b/frontend/src/routes/(app)/(third-party)/requirement-assessments/[id=uuid]/edit/+page.svelte
index 2047d2a9b..3895891ac 100644
--- a/frontend/src/routes/(app)/(third-party)/requirement-assessments/[id=uuid]/edit/+page.svelte
+++ b/frontend/src/routes/(app)/(third-party)/requirement-assessments/[id=uuid]/edit/+page.svelte
@@ -40,7 +40,8 @@
 	import { superForm } from 'sveltekit-superforms';
 
 	import { complianceResultColorMap } from '$lib/utils/constants';
-	import { capitalizeFirstLetter, localItems } from '$lib/utils/locales';
+	import { capitalizeFirstLetter } from '$lib/utils/locales';
+	import { safeTranslate } from '$lib/utils/i18n';
 	import { hideSuggestions } from '$lib/utils/stores';
 	import * as m from '$paraglide/messages';
 
@@ -87,7 +88,7 @@
 			type: 'component',
 			component: modalComponent,
 			// Data
-			title: localItems()['add' + capitalizeFirstLetter(data.measureModel.localName)]
+			title: safeTranslate('add' + capitalizeFirstLetter(data.measureModel.localName))
 		};
 		modalStore.trigger(modal);
 	}
@@ -106,7 +107,7 @@
 			type: 'component',
 			component: modalComponent,
 			// Data
-			title: localItems()['add' + capitalizeFirstLetter(data.evidenceModel.localName)]
+			title: safeTranslate('add' + capitalizeFirstLetter(data.evidenceModel.localName))
 		};
 		modalStore.trigger(modal);
 	}
diff --git a/frontend/tests/functional/nav.test.ts b/frontend/tests/functional/nav.test.ts
index 051350fd7..637738c8a 100644
--- a/frontend/tests/functional/nav.test.ts
+++ b/frontend/tests/functional/nav.test.ts
@@ -1,5 +1,4 @@
 import { safeTranslate } from '$lib/utils/i18n';
-import { localItems } from '../../src/lib/utils/locales.js';
 import { availableLanguageTags, setLanguageTag } from '../../src/paraglide/runtime.js';
 import { expect, setHttpResponsesListener, test } from '../utils/test-utils.js';
 
@@ -71,7 +70,7 @@ test('sidebar navigation tests', async ({ logedPage, analyticsPage, sideBar, pag
 			await expect(sideBar.morePanel).not.toHaveAttribute('inert');
 			await expect(sideBar.languageSelect).toBeVisible();
 			setLanguageTag(languageTag);
-			const locales = localItems(languageTag);
+			const locales = safeTranslate(languageTag);
 			await sideBar.languageSelect.selectOption(languageTag);
 			await logedPage.hasTitle(locales['analytics']);
 		}

From 19df06a6eca95dc9cb2b6c951515a76fdebe7f86 Mon Sep 17 00:00:00 2001
From: monsieurswag <mael.joumier@intuitem.com>
Date: Wed, 16 Oct 2024 11:29:00 +0200
Subject: [PATCH 02/14] Remove localItems function from codebase

---
 frontend/src/lib/utils/locales.ts | 361 ------------------------------
 1 file changed, 361 deletions(-)

diff --git a/frontend/src/lib/utils/locales.ts b/frontend/src/lib/utils/locales.ts
index 8bc30c061..43e03bf85 100644
--- a/frontend/src/lib/utils/locales.ts
+++ b/frontend/src/lib/utils/locales.ts
@@ -58,364 +58,3 @@ export function toCamelCase(str: string) {
 export function capitalizeFirstLetter(str: string) {
 	return str.charAt(0).toUpperCase() + str.slice(1);
 }
-
-interface LocalItems {
-	[key: string]: string;
-}
-
-/**
- * @deprecated Use `safeTranslate` instead.
- */
-export function localItems(): LocalItems {
-	const LOCAL_ITEMS = {
-		french: m.french(),
-		english: m.english(),
-		arabic: m.arabic(),
-		portuguese: m.portuguese(),
-		spanish: m.spanish(),
-		german: m.german(),
-		dutch: m.dutch(),
-		italian: m.italian(),
-		polish: m.polish(),
-		romanian: m.romanian(),
-		home: m.home(),
-		edit: m.edit(),
-		overview: m.overview(),
-		context: m.context(),
-		catalog: m.catalog(),
-		actions: m.actions(),
-		operations: m.operations(),
-		governance: m.governance(),
-		risk: m.risk(),
-		compliance: m.compliance(),
-		organization: m.organization(),
-		extra: m.extra(),
-		analytics: m.analytics(),
-		calendar: m.calendar(),
-		threats: m.threats(),
-		referenceControls: m.referenceControls(),
-		appliedControls: m.appliedControls(),
-		assets: m.assets(),
-		asset: m.asset(),
-		policies: m.policies(),
-		riskMatrices: m.riskMatrices(),
-		riskAssessments: m.riskAssessments(),
-		riskScenarios: m.riskScenarios(),
-		riskScenario: m.riskScenario(),
-		riskAcceptances: m.riskAcceptances(),
-		riskAcceptance: m.riskAcceptance(),
-		complianceAssessments: m.complianceAssessments(),
-		complianceAssessment: m.complianceAssessment(),
-		evidences: m.evidences(),
-		evidence: m.evidence(),
-		frameworks: m.frameworks(),
-		domains: m.domains(),
-		projects: m.projects(),
-		users: m.users(),
-		user: m.user(),
-		userGroups: m.userGroups(),
-		roleAssignments: m.roleAssignments(),
-		xRays: m.xRays(),
-		inspect: m.inspect(),
-		scoringAssistant: m.scoringAssistant(),
-		libraries: m.libraries(),
-		backupRestore: m.backupRestore(),
-		myProfile: m.myProfile(),
-		aboutCiso: m.aboutCiso(),
-		Logout: m.Logout(),
-		name: m.name(),
-		description: m.description(),
-		parentDomain: m.parentDomain(),
-		ref: m.ref(),
-		refId: m.refId(),
-		businessValue: m.businessValue(),
-		email: m.email(),
-		firstName: m.firstName(),
-		lastName: m.lastName(),
-		category: m.category(),
-		function: m.csfFunction(),
-		eta: m.eta(),
-		referenceControl: m.referenceControl(),
-		appliedControl: m.appliedControl(),
-		provider: m.provider(),
-		domain: m.domain(),
-		urn: m.urn(),
-		id: m.id(),
-		treatmentStatus: m.treatmentStatus(),
-		currentLevel: m.currentLevel(),
-		residualLevel: m.residualLevel(),
-		riskMatrix: m.riskMatrix(),
-		project: m.project(),
-		folder: m.folder(),
-		riskAssessment: m.riskAssessment(),
-		threat: m.threat(),
-		framework: m.framework(),
-		file: m.file(),
-		language: m.language(),
-		builtin: m.builtin(),
-		status: m.status(),
-		effort: m.effort(),
-		cost: m.cost(),
-		impact: m.impact(),
-		expiryDate: m.expiryDate(),
-		link: m.link(),
-		createdAt: m.createdAt(),
-		updatedAt: m.updatedAt(),
-		acceptedAt: m.acceptedAt(),
-		rejectedAt: m.rejectedAt(),
-		revokedAt: m.revokedAt(),
-		accepted: m.accept(),
-		rejected: m.rejected(),
-		revoked: m.revoked(),
-		submitted: m.submitted(),
-		locale: m.locale(),
-		defaultLocale: m.defaultLocale(),
-		annotation: m.annotation(),
-		library: m.library(),
-		typicalEvidence: m.typicalEvidence(),
-		parentAsset: m.parentAsset(),
-		parentAssets: m.parentAssets(),
-		approver: m.approver(),
-		state: m.state(),
-		justification: m.justification(),
-		parentFolder: m.parentFolder(),
-		contentType: m.contentType(),
-		type: m.type(),
-		lcStatus: m.lcStatus(),
-		internalReference: m.internalReference(),
-		isActive: m.isActive(),
-		dateJoined: m.dateJoined(),
-		version: m.version(),
-		treatment: m.treatment(),
-		rid: m.rid(),
-		currentProba: m.currentProba(),
-		currentImpact: m.currentImpact(),
-		residualProba: m.residualProba(),
-		residualImpact: m.residualImpact(),
-		existingControls: m.existingControls(),
-		strengthOfKnowledge: m.strengthOfKnowledge(),
-		dueDate: m.dueDate(),
-		attachment: m.attachment(),
-		observation: m.observation(),
-		planned: m.planned(),
-		active: m.active(),
-		inactive: m.inactive(),
-		addThreat: m.addThreat(),
-		addReferenceControl: m.addReferenceControl(),
-		addAppliedControl: m.addAppliedControl(),
-		addAsset: m.addAsset(),
-		addRiskAssessment: m.addRiskAssessment(),
-		addRiskScenario: m.addRiskScenario(),
-		addRiskAcceptance: m.addRiskAcceptance(),
-		addComplianceAssessment: m.addComplianceAssessment(),
-		addEvidence: m.addEvidence(),
-		addDomain: m.addDomain(),
-		addProject: m.addProject(),
-		addUser: m.addUser(),
-		addPolicy: m.addPolicy(),
-		associatedThreats: m.associatedThreats(),
-		associatedReferenceControls: m.associatedReferenceControls(),
-		associatedAppliedControls: m.associatedAppliedControls(),
-		associatedAssets: m.associatedAssets(),
-		associatedRiskAssessments: m.associatedRiskAssessments(),
-		associatedRiskScenarios: m.associatedRiskScenarios(),
-		associatedRiskAcceptances: m.associatedRiskAcceptances(),
-		associatedComplianceAssessments: m.associatedComplianceAssessments(),
-		associatedEvidences: m.associatedEvidences(),
-		associatedDomains: m.associatedDomains(),
-		associatedProjects: m.associatedProjects(),
-		associatedUsers: m.associatedUsers(),
-		changePassword: m.changePassword(),
-		label: m.label(),
-		NA: m.NA(),
-		threatAgentFactors: m.threatAgentFactors(),
-		vulnerabilityFactors: m.vulnerabilityFactors(),
-		businessImpactFactors: m.businessImpactFactors(),
-		technicalImpactFactors: m.technicalImpactFactors(),
-		assessmentVector: m.assessmentVector(),
-		skillLevelText: m.skillLevelText(),
-		skillLevelChoice1: m.skillLevelChoice1(),
-		skillLevelChoice2: m.skillLevelChoice2(),
-		skillLevelChoice3: m.skillLevelChoice3(),
-		skillLevelChoice4: m.skillLevelChoice4(),
-		skillLevelChoice5: m.skillLevelChoice5(),
-		motiveText: m.motiveText(),
-		motiveChoice1: m.motiveChoice1(),
-		motiveChoice2: m.motiveChoice2(),
-		motiveChoice3: m.motiveChoice3(),
-		opportunityText: m.opportunityText(),
-		opportunityChoice1: m.opportunityChoice1(),
-		opportunityChoice2: m.opportunityChoice2(),
-		opportunityChoice3: m.opportunityChoice3(),
-		opportunityChoice4: m.opportunityChoice4(),
-		sizeText: m.sizeText(),
-		sizeChoice1: m.sizeChoice1(),
-		sizeChoice2: m.sizeChoice2(),
-		sizeChoice3: m.sizeChoice3(),
-		sizeChoice4: m.sizeChoice4(),
-		sizeChoice5: m.sizeChoice5(),
-		easeOfDiscoveryText: m.easeOfDiscoveryText(),
-		easeOfDiscoveryChoice1: m.easeOfDiscoveryChoice1(),
-		easeOfDiscoveryChoice2: m.easeOfDiscoveryChoice2(),
-		easeOfDiscoveryChoice3: m.easeOfDiscoveryChoice3(),
-		easeOfDiscoveryChoice4: m.easeOfDiscoveryChoice4(),
-		easeOfExploitText: m.easeOfExploitText(),
-		easeOfExploitChoice1: m.easeOfExploitChoice1(),
-		easeOfExploitChoice2: m.easeOfExploitChoice2(),
-		easeOfExploitChoice3: m.easeOfExploitChoice3(),
-		easeOfExploitChoice4: m.easeOfExploitChoice4(),
-		awarenessText: m.awarenessText(),
-		awarenessChoice1: m.awarenessChoice1(),
-		awarenessChoice2: m.awarenessChoice2(),
-		awarenessChoice3: m.awarenessChoice3(),
-		awarenessChoice4: m.awarenessChoice4(),
-		intrusionDetectionText: m.intrusionDetectionText(),
-		intrusionDetectionChoice1: m.intrusionDetectionChoice1(),
-		intrusionDetectionChoice2: m.intrusionDetectionChoice2(),
-		intrusionDetectionChoice3: m.intrusionDetectionChoice3(),
-		intrusionDetectionChoice4: m.intrusionDetectionChoice4(),
-		financialDamageText: m.financialDamageText(),
-		financialDamageChoice1: m.financialDamageChoice1(),
-		financialDamageChoice2: m.financialDamageChoice2(),
-		financialDamageChoice3: m.financialDamageChoice3(),
-		financialDamageChoice4: m.financialDamageChoice4(),
-		reputationDamageText: m.reputationDamageText(),
-		reputationDamageChoice1: m.reputationDamageChoice1(),
-		reputationDamageChoice2: m.reputationDamageChoice2(),
-		reputationDamageChoice3: m.reputationDamageChoice3(),
-		reputationDamageChoice4: m.reputationDamageChoice4(),
-		nonComplianceText: m.nonComplianceText(),
-		nonComplianceChoice1: m.nonComplianceChoice1(),
-		nonComplianceChoice2: m.nonComplianceChoice2(),
-		nonComplianceChoice3: m.nonComplianceChoice3(),
-		nonComplianceChoice4: m.nonComplianceChoice4(),
-		privacyViolationText: m.privacyViolationText(),
-		privacyViolationChoice1: m.privacyViolationChoice1(),
-		privacyViolationChoice2: m.privacyViolationChoice2(),
-		privacyViolationChoice3: m.privacyViolationChoice3(),
-		privacyViolationChoice4: m.privacyViolationChoice4(),
-		lossOfConfidentialityText: m.lossOfConfidentialityText(),
-		lossOfConfidentialityChoice1: m.lossOfConfidentialityChoice1(),
-		lossOfConfidentialityChoice2: m.lossOfConfidentialityChoice2(),
-		lossOfConfidentialityChoice3: m.lossOfConfidentialityChoice3(),
-		lossOfConfidentialityChoice4: m.lossOfConfidentialityChoice4(),
-		lossOfIntegrityText: m.lossOfIntegrityText(),
-		lossOfIntegrityChoice1: m.lossOfIntegrityChoice1(),
-		lossOfIntegrityChoice2: m.lossOfIntegrityChoice2(),
-		lossOfIntegrityChoice3: m.lossOfIntegrityChoice3(),
-		lossOfIntegrityChoice4: m.lossOfIntegrityChoice4(),
-		lossOfIntegrityChoice5: m.lossOfIntegrityChoice5(),
-		lossOfAvailabilityText: m.lossOfAvailabilityText(),
-		lossOfAvailabilityChoice1: m.lossOfAvailabilityChoice1(),
-		lossOfAvailabilityChoice2: m.lossOfAvailabilityChoice2(),
-		lossOfAvailabilityChoice3: m.lossOfAvailabilityChoice3(),
-		lossOfAvailabilityChoice4: m.lossOfAvailabilityChoice4(),
-		lossOfAccountabilityText: m.lossOfAccountabilityText(),
-		lossOfAccountabilityChoice1: m.lossOfAccountabilityChoice1(),
-		lossOfAccountabilityChoice2: m.lossOfAccountabilityChoice2(),
-		lossOfAccountabilityChoice3: m.lossOfAccountabilityChoice3(),
-		undefined: m.undefined(),
-		production: m.production(),
-		development: m.development(),
-		design: m.design(),
-		endOfLife: m.endOfLife(),
-		dropped: m.dropped(),
-		technical: m.technical(),
-		physical: m.physical(),
-		veryLow: m.veryLow(),
-		low: m.low(),
-		high: m.high(),
-		veryHigh: m.veryHigh(),
-		small: m.small(),
-		medium: m.medium(),
-		large: m.large(),
-		extraLarge: m.extraLarge(),
-		policy: m.policy(),
-		process: m.process(),
-		composer: m.composer(),
-		plan: m.plan(),
-		open: m.open(),
-		mitigate: m.mitigate(),
-		accept: m.accept(),
-		transfer: m.transfer(),
-		avoid: m.avoid(),
-		primary: m.primary(),
-		support: m.support(),
-		toDo: m.toDo(),
-		inProgress: m.inProgress(),
-		inReview: m.inReview(),
-		deprecated: m.deprecated(),
-		done: m.done(),
-		nonCompliant: m.nonCompliant(),
-		partiallyCompliant: m.partiallyCompliant(),
-		requirementAssessments: m.requirementAssessments(),
-		compliant: m.compliant(),
-		notApplicable: m.notApplicable(),
-		administrator: m.administrator(),
-		analyst: m.analyst(),
-		reader: m.reader(),
-		domainManager: m.domainManager(),
-		authors: m.authors(),
-		reviewers: m.reviewers(),
-		isPublished: m.isPublished(),
-		noFileDetected: m.noFileDetected(),
-		rankingScore: m.rankingScore(),
-		'--SOK': m.undefinedSOK(),
-		lowSOK: m.lowSOK(),
-		mediumSOK: m.mediumSOK(),
-		highSOK: m.highSOK(),
-		libraryLoadingError: m.libraryLoadingError(),
-		libraryAlreadyExistsError: m.libraryAlreadyLoadedError(),
-		invalidLibraryFileError: m.invalidLibraryFileError(),
-		libraryNotFound: m.libraryNotFound(),
-		libraryHasNoUpdate: m.libraryHasNoUpdate(),
-		dependencyNotFound: m.dependencyNotFound(),
-		invalidLibraryUpdate: m.invalidLibraryUpdate(),
-		minScore: m.minScore(),
-		maxScore: m.maxScore(),
-		scoresDefinition: m.scoresDefinition(),
-		selectedImplementationGroups: m.selectedImplementationGroups(),
-		implementationGroupsDefinition: m.implementationGroupsDefinition(),
-		attemptToDeleteOnlyAdminAccountError: m.attemptToDeleteOnlyAdminAccountError(),
-		attemptToRemoveOnlyAdminUserGroup: m.attemptToRemoveOnlyAdminUserGroup(),
-		actionPlan: m.actionPlan(),
-		matchingRequirements: m.matchingRequirements(),
-		remediationPlan: m.remediationPlan(),
-		incoming: m.incoming(),
-		today: m.today(),
-		outdated: m.outdated(),
-		flashMode: m.flashMode(),
-		complianceAssessmentInProgress: m.complianceAssessmentInProgress(),
-		complianceAssessmentNoAuthor: m.complianceAssessmentNoAuthor(),
-		requirementAssessmentNoAppliedControl: m.requirementAssessmentNoAppliedControl(),
-		appliedControlNoReferenceControl: m.appliedControlNoReferenceControl(),
-		evidenceNoFile: m.evidenceNoFile(),
-		riskAssessmentInProgress: m.riskAssessmentInProgress(),
-		riskAssessmentNoAuthor: m.riskAssessmentNoAuthor(),
-		riskAssessmentEmpty: m.riskAssessmentEmpty(),
-		riskScenarioNoCurrentLevel: m.riskScenarioNoCurrentLevel(),
-		riskScenarioNoResidualLevel: m.riskScenarioNoResidualLevel(),
-		riskScenarioResidualHigherThanCurrent: m.riskScenarioResidualHigherThanCurrent(),
-		riskScenarioResidualProbaHigherThanCurrent: m.riskScenarioResidualProbaHigherThanCurrent(),
-		riskScenarioResidualImpactHigherThanCurrent: m.riskScenarioResidualImpactHigherThanCurrent(),
-		riskScenarioResidualLoweredWithoutMeasures: m.riskScenarioResidualLoweredWithoutMeasures(),
-		riskScenarioAcceptedNoAcceptance: m.riskScenarioAcceptedNoAcceptance(),
-		appliedControlNoETA: m.appliedControlNoETA(),
-		appliedControlETAInPast: m.appliedControlETAInPast(),
-		appliedControlNoEffort: m.appliedControlNoEffort(),
-		appliedControlNoCost: m.appliedControlNoCost(),
-		appliedControlNoLink: m.appliedControlNoLink(),
-		riskAcceptanceNoExpiryDate: m.riskAcceptanceNoExpiryDate(),
-		riskAcceptanceExpired: m.riskAcceptanceExpired(),
-		thirdParty: m.thirdParty(),
-		financial: m.financial(),
-		legal: m.legal(),
-		reputation: m.reputation(),
-		operational: m.operational(),
-		confidentiality: m.confidentiality(),
-		integrity: m.integrity(),
-		availability: m.availability(),
-		authenticity: m.authenticity()
-	};
-	return LOCAL_ITEMS;
-}

From d37c417d1f224bd24b791a7453623dd04b68a4e4 Mon Sep 17 00:00:00 2001
From: monsieurswag <mael.joumier@intuitem.com>
Date: Wed, 16 Oct 2024 15:53:24 +0200
Subject: [PATCH 03/14] Attempt to fix weird legacy localItems usage

---
 frontend/tests/functional/nav.test.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frontend/tests/functional/nav.test.ts b/frontend/tests/functional/nav.test.ts
index 637738c8a..ac1e9293a 100644
--- a/frontend/tests/functional/nav.test.ts
+++ b/frontend/tests/functional/nav.test.ts
@@ -1,6 +1,7 @@
 import { safeTranslate } from '$lib/utils/i18n';
 import { availableLanguageTags, setLanguageTag } from '../../src/paraglide/runtime.js';
 import { expect, setHttpResponsesListener, test } from '../utils/test-utils.js';
+import * as m from '$paraglide/messages.js';
 
 test('sidebar navigation tests', async ({ logedPage, analyticsPage, sideBar, page }) => {
 	test.slow();
@@ -70,9 +71,8 @@ test('sidebar navigation tests', async ({ logedPage, analyticsPage, sideBar, pag
 			await expect(sideBar.morePanel).not.toHaveAttribute('inert');
 			await expect(sideBar.languageSelect).toBeVisible();
 			setLanguageTag(languageTag);
-			const locales = safeTranslate(languageTag);
 			await sideBar.languageSelect.selectOption(languageTag);
-			await logedPage.hasTitle(locales['analytics']);
+			await logedPage.hasTitle(m.analytics());
 		}
 	});
 

From 69b9d3264c17a298fe87724eca4d15eca3c67260 Mon Sep 17 00:00:00 2001
From: monsieurswag <mael.joumier@intuitem.com>
Date: Wed, 16 Oct 2024 15:55:07 +0200
Subject: [PATCH 04/14] Remove double import

---
 .../requirement-assessments/[id=uuid]/edit/+page.svelte          | 1 -
 1 file changed, 1 deletion(-)

diff --git a/frontend/src/routes/(app)/(third-party)/requirement-assessments/[id=uuid]/edit/+page.svelte b/frontend/src/routes/(app)/(third-party)/requirement-assessments/[id=uuid]/edit/+page.svelte
index 3895891ac..d604b2c09 100644
--- a/frontend/src/routes/(app)/(third-party)/requirement-assessments/[id=uuid]/edit/+page.svelte
+++ b/frontend/src/routes/(app)/(third-party)/requirement-assessments/[id=uuid]/edit/+page.svelte
@@ -41,7 +41,6 @@
 
 	import { complianceResultColorMap } from '$lib/utils/constants';
 	import { capitalizeFirstLetter } from '$lib/utils/locales';
-	import { safeTranslate } from '$lib/utils/i18n';
 	import { hideSuggestions } from '$lib/utils/stores';
 	import * as m from '$paraglide/messages';
 

From 304e7198a499874425362c5f7a5da07489ddeca3 Mon Sep 17 00:00:00 2001
From: monsieurswag <mael.joumier@intuitem.com>
Date: Thu, 17 Oct 2024 21:02:38 +0200
Subject: [PATCH 05/14] Add unsafeTranslate method

---
 .../lib/components/ModelTable/ModelTable.svelte  | 16 ++++++++--------
 frontend/src/lib/utils/i18n.ts                   | 15 +++++++++++++++
 2 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/frontend/src/lib/components/ModelTable/ModelTable.svelte b/frontend/src/lib/components/ModelTable/ModelTable.svelte
index c91aafb5f..79c07e5f9 100644
--- a/frontend/src/lib/components/ModelTable/ModelTable.svelte
+++ b/frontend/src/lib/components/ModelTable/ModelTable.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import { safeTranslate } from '$lib/utils/i18n';
+	import { safeTranslate, unsafeTranslate } from '$lib/utils/i18n';
 	import { page } from '$app/stores';
 	import TableRowActions from '$lib/components/TableRowActions/TableRowActions.svelte';
 	import {
@@ -282,7 +282,7 @@
 		<thead class="table-head {regionHead}">
 			<tr>
 				{#each Object.entries(source.head) as [key, heading]}
-					<Th {handler} orderBy={key} class="{regionHeadCell}">{safeTranslate(heading) ?? heading}</Th>
+					<Th {handler} orderBy={key} class="{regionHeadCell}">{unsafeTranslate(heading) ?? heading}</Th>
 				{/each}
         {#if displayActions}
         <th class="{regionHeadCell} select-none text-end"></th>
@@ -349,8 +349,8 @@
                             )?.urlModel
                           }/${val.id}`}
                           <a href={itemHref} class="anchor" on:click={e => e.stopPropagation()}>{val.str}</a>
-                        {:else if safeTranslate(val.split(':')[0])}
-                        	<span class="text">{safeTranslate(val.split(':')[0]+"Colon")} {val.split(':')[1]}</span>
+                        {:else if unsafeTranslate(val.split(':')[0])}
+														<span class="text">{unsafeTranslate(val.split(':')[0]+"Colon")} {val.split(':')[1]}</span>
 						{:else}
 						  {val ?? '-'}
                         {/if}
@@ -368,8 +368,8 @@
                   {/if}
                 {:else if value && value.hexcolor}
                   <p class="flex w-fit min-w-24 justify-center px-2 py-1 rounded-md ml-2 whitespace-nowrap {classesHexBackgroundText(value.hexcolor)}" style="background-color: {value.hexcolor}">
-                    {#if safeTranslate(toCamelCase(value.name ?? value.str ?? '-'))}
-                      {safeTranslate(toCamelCase(value.name ?? value.str ?? '-'))}
+                    {#if unsafeTranslate(toCamelCase(value.name ?? value.str ?? '-'))}
+                      {unsafeTranslate(toCamelCase(value.name ?? value.str ?? '-'))}
                     {:else}
                       {value.name ?? value.str ?? '-'}
                     {/if}
@@ -377,8 +377,8 @@
 				{:else if ISO_8601_REGEX.test(value)}
 									{formatDateOrDateTime(value, languageTag())}
                 {:else}
-					{#if safeTranslate(toCamelCase(value))}
-						{safeTranslate(toCamelCase(value))}
+					{#if unsafeTranslate(toCamelCase(value))}
+						{unsafeTranslate(toCamelCase(value))}
 					{:else}
 						{value ?? '-'}
 					{/if}
diff --git a/frontend/src/lib/utils/i18n.ts b/frontend/src/lib/utils/i18n.ts
index ed139fb74..3d8cbb977 100644
--- a/frontend/src/lib/utils/i18n.ts
+++ b/frontend/src/lib/utils/i18n.ts
@@ -16,3 +16,18 @@ export function safeTranslate(key: string, params = {}, options = {}): string {
 	}
 	return key;
 }
+
+/**
+ * Unafe translate function that doesn't return anything if the key if the translation is not found.
+ * @param key The key to translate.
+ * @param params The parameters to pass to the translation function.
+ * @param options The options to pass to the translation function.
+ */
+export function unsafeTranslate(key: string, params = {}, options = {}): string {
+	if (Object.hasOwn(m, toCamelCase(key))) {
+		return m[toCamelCase(key)](params, options);
+	}
+	if (Object.hasOwn(m, key)) {
+		return m[key](params, options);
+	}
+}

From e7931ed3c69f60ecd9af4330d7509cab6b5526a5 Mon Sep 17 00:00:00 2001
From: monsieurswag <mael.joumier@intuitem.com>
Date: Thu, 17 Oct 2024 21:13:29 +0200
Subject: [PATCH 06/14] Clean translation usage

---
 .../Forms/AutocompleteSelect.svelte           |  7 ++-
 .../Modals/MissingConstraintsModal.svelte     |  2 +-
 .../components/ModelTable/ModelTable.svelte   | 12 +----
 frontend/src/lib/utils/i18n.ts                | 20 +++-----
 .../[id=uuid]/+page.server.ts                 |  6 +--
 .../frameworks/[id=uuid]/+page.svelte         |  2 +-
 .../risk-assessments/[id=uuid]/+page.svelte   |  2 +-
 .../risk-scenarios/[id=uuid]/+page.svelte     | 49 ++++---------------
 .../[id=uuid]/edit/RiskLevel.svelte           |  6 +--
 .../[id=uuid]/+page.svelte                    | 10 +---
 .../evidences/[id=uuid]/+page.svelte          |  2 +-
 11 files changed, 31 insertions(+), 87 deletions(-)

diff --git a/frontend/src/lib/components/Forms/AutocompleteSelect.svelte b/frontend/src/lib/components/Forms/AutocompleteSelect.svelte
index 1162bf5b3..096a50307 100644
--- a/frontend/src/lib/components/Forms/AutocompleteSelect.svelte
+++ b/frontend/src/lib/components/Forms/AutocompleteSelect.svelte
@@ -1,7 +1,6 @@
 <script lang="ts">
 	import { formFieldProxy } from 'sveltekit-superforms';
-	import { toCamelCase } from '$lib/utils/locales';
-	import { safeTranslate } from '$lib/utils/i18n';
+	import { unsafeTranslate } from '$lib/utils/i18n';
 	import type { CacheLock } from '$lib/utils/types';
 	import { onMount } from 'svelte';
 
@@ -121,8 +120,8 @@
 				{#if option.suggested}
 					<span class="text-indigo-600">{option.label}</span>
 					<span class="text-sm text-gray-500"> (suggested)</span>
-				{:else if translateOptions && safeTranslate(toCamelCase(option.label))}
-					{safeTranslate(toCamelCase(option.label))}
+				{:else if translateOptions && unsafeTranslate(option.label)}
+					{unsafeTranslate(option.label)}
 				{:else}
 					{option.label}
 				{/if}
diff --git a/frontend/src/lib/components/Modals/MissingConstraintsModal.svelte b/frontend/src/lib/components/Modals/MissingConstraintsModal.svelte
index ccaa28933..18bf88ea2 100644
--- a/frontend/src/lib/components/Modals/MissingConstraintsModal.svelte
+++ b/frontend/src/lib/components/Modals/MissingConstraintsModal.svelte
@@ -28,7 +28,7 @@
 			{#if value}
 				{m.missingMandatoyObjects1({ model: $modalStore[0].body })}:
 				{#each value as key}
-					<li class="font-bold">{safeTranslate(toCamelCase(key))}</li>
+					<li class="font-bold">{safeTranslate(key)}</li>
 				{/each}
 				{m.missingMandatoyObjects2()}.
 			{/if}
diff --git a/frontend/src/lib/components/ModelTable/ModelTable.svelte b/frontend/src/lib/components/ModelTable/ModelTable.svelte
index 79c07e5f9..b4f0bd4d7 100644
--- a/frontend/src/lib/components/ModelTable/ModelTable.svelte
+++ b/frontend/src/lib/components/ModelTable/ModelTable.svelte
@@ -368,20 +368,12 @@
                   {/if}
                 {:else if value && value.hexcolor}
                   <p class="flex w-fit min-w-24 justify-center px-2 py-1 rounded-md ml-2 whitespace-nowrap {classesHexBackgroundText(value.hexcolor)}" style="background-color: {value.hexcolor}">
-                    {#if unsafeTranslate(toCamelCase(value.name ?? value.str ?? '-'))}
-                      {unsafeTranslate(toCamelCase(value.name ?? value.str ?? '-'))}
-                    {:else}
-                      {value.name ?? value.str ?? '-'}
-                    {/if}
+										{safeTranslate(value.name ?? value.str ?? '-')}
                   </p>
 				{:else if ISO_8601_REGEX.test(value)}
 									{formatDateOrDateTime(value, languageTag())}
                 {:else}
-					{#if unsafeTranslate(toCamelCase(value))}
-						{unsafeTranslate(toCamelCase(value))}
-					{:else}
-						{value ?? '-'}
-					{/if}
+						{unsafeTranslate(value) ?? '-'}
                 {/if}
                 </span>
 							{/if}
diff --git a/frontend/src/lib/utils/i18n.ts b/frontend/src/lib/utils/i18n.ts
index 3d8cbb977..7022e969f 100644
--- a/frontend/src/lib/utils/i18n.ts
+++ b/frontend/src/lib/utils/i18n.ts
@@ -2,32 +2,24 @@ import * as m from '$paraglide/messages.js';
 import { toCamelCase } from '$lib/utils/locales';
 
 /**
- * Safe translate function that returns the key if the translation is not found.
+ * Unafe translate function that doesn't return anything if the key if the translation is not found.
  * @param key The key to translate.
  * @param params The parameters to pass to the translation function.
  * @param options The options to pass to the translation function.
  */
-export function safeTranslate(key: string, params = {}, options = {}): string {
-	if (Object.hasOwn(m, toCamelCase(key))) {
-		return m[toCamelCase(key)](params, options);
-	}
+export function unsafeTranslate(key: string, params = {}, options = {}): string | undefined {
+	key = toCamelCase(key);
 	if (Object.hasOwn(m, key)) {
 		return m[key](params, options);
 	}
-	return key;
 }
 
 /**
- * Unafe translate function that doesn't return anything if the key if the translation is not found.
+ * Safe translate function that returns the key if the translation is not found.
  * @param key The key to translate.
  * @param params The parameters to pass to the translation function.
  * @param options The options to pass to the translation function.
  */
-export function unsafeTranslate(key: string, params = {}, options = {}): string {
-	if (Object.hasOwn(m, toCamelCase(key))) {
-		return m[toCamelCase(key)](params, options);
-	}
-	if (Object.hasOwn(m, key)) {
-		return m[key](params, options);
-	}
+export function safeTranslate(key: string, params = {}, options = {}): string {
+	return unsafeTranslate(key) || key;
 }
diff --git a/frontend/src/routes/(app)/(internal)/[model=urlmodel]/[id=uuid]/+page.server.ts b/frontend/src/routes/(app)/(internal)/[model=urlmodel]/[id=uuid]/+page.server.ts
index 06243768c..4ac2bcad2 100644
--- a/frontend/src/routes/(app)/(internal)/[model=urlmodel]/[id=uuid]/+page.server.ts
+++ b/frontend/src/routes/(app)/(internal)/[model=urlmodel]/[id=uuid]/+page.server.ts
@@ -54,7 +54,7 @@ export const actions: Actions = {
 		return message(
 			rejectForm,
 			m.successfullyRejectedObject({
-				object: safeTranslate(toCamelCase(model.toLowerCase())).toLowerCase(),
+				object: safeTranslate(model).toLowerCase(),
 				id: id
 			})
 		);
@@ -88,7 +88,7 @@ export const actions: Actions = {
 		return message(
 			acceptForm,
 			m.successfullyValidatedObject({
-				object: safeTranslate(toCamelCase(model.toLowerCase())).toLowerCase(),
+				object: safeTranslate(model).toLowerCase(),
 				id: id
 			})
 		);
@@ -122,7 +122,7 @@ export const actions: Actions = {
 		return message(
 			revokeForm,
 			m.successfullyRevokedObject({
-				object: safeTranslate(toCamelCase(model.toLowerCase())).toLowerCase(),
+				object: safeTranslate(model).toLowerCase(),
 				id: id
 			})
 		);
diff --git a/frontend/src/routes/(app)/(internal)/frameworks/[id=uuid]/+page.svelte b/frontend/src/routes/(app)/(internal)/frameworks/[id=uuid]/+page.svelte
index 9a824d52b..847143f3a 100644
--- a/frontend/src/routes/(app)/(internal)/frameworks/[id=uuid]/+page.svelte
+++ b/frontend/src/routes/(app)/(internal)/frameworks/[id=uuid]/+page.svelte
@@ -49,7 +49,7 @@
 						{#if key === 'urn'}
 							{m.urn()}
 						{:else}
-							{safeTranslate(toCamelCase(key))}
+							{safeTranslate(key)}
 						{/if}
 					</div>
 					<ul class="text-sm">
diff --git a/frontend/src/routes/(app)/(internal)/risk-assessments/[id=uuid]/+page.svelte b/frontend/src/routes/(app)/(internal)/risk-assessments/[id=uuid]/+page.svelte
index 57e0792f2..00d83a599 100644
--- a/frontend/src/routes/(app)/(internal)/risk-assessments/[id=uuid]/+page.svelte
+++ b/frontend/src/routes/(app)/(internal)/risk-assessments/[id=uuid]/+page.svelte
@@ -166,7 +166,7 @@
 							<span class="font-semibold">{m.status()}:</span>
 							{risk_assessment.status === null
 								? '--'
-								: safeTranslate(toCamelCase(risk_assessment.status))}
+								: safeTranslate(risk_assessment.status)}
 						</li>
 						<li class="pb-1">
 							<span class="font-semibold">{m.authors()}:</span>
diff --git a/frontend/src/routes/(app)/(internal)/risk-scenarios/[id=uuid]/+page.svelte b/frontend/src/routes/(app)/(internal)/risk-scenarios/[id=uuid]/+page.svelte
index 7b7628504..c6d60919d 100644
--- a/frontend/src/routes/(app)/(internal)/risk-scenarios/[id=uuid]/+page.svelte
+++ b/frontend/src/routes/(app)/(internal)/risk-scenarios/[id=uuid]/+page.svelte
@@ -100,7 +100,7 @@
 				<div>
 					<p class="text-sm font-semibold text-gray-400">{m.treatmentStatus()}</p>
 					<p class="text-sm font-semibold">
-						{safeTranslate(toCamelCase(data.scenario.treatment))}
+						{safeTranslate(data.scenario.treatment)}
 					</p>
 				</div>
 			</div>
@@ -135,11 +135,7 @@
 					class="text-sm text-center font-semibold p-2 rounded-md w-20"
 					style="background-color: {color_map[data.scenario.current_proba]}"
 				>
-					{#if safeTranslate(toCamelCase(data.scenario.current_proba.name))}
-						{safeTranslate(toCamelCase(data.scenario.current_proba.name))}
-					{:else}
-						{data.scenario.current_proba.name}
-					{/if}
+					{safeTranslate(data.scenario.current_proba.name)}
 				</span>
 			</p>
 			<i class="fa-solid fa-xmark mt-5" />
@@ -149,11 +145,7 @@
 					class="text-sm text-center font-semibold p-2 rounded-md w-20"
 					style="background-color: {color_map[data.scenario.current_impact]}"
 				>
-					{#if safeTranslate(toCamelCase(data.scenario.current_impact.name))}
-						{safeTranslate(toCamelCase(data.scenario.current_impact.name))}
-					{:else}
-						{data.scenario.current_impact.name}
-					{/if}
+					{safeTranslate(data.scenario.current_impact.name)}
 				</span>
 			</p>
 			<i class="fa-solid fa-equals mt-5" />
@@ -167,11 +159,7 @@
 					)}"
 					style="background-color: {data.scenario.current_level.hexcolor}"
 				>
-					{#if safeTranslate(toCamelCase(data.scenario.current_level.name))}
-						{safeTranslate(toCamelCase(data.scenario.current_level.name))}
-					{:else}
-						{data.scenario.current_level.name}
-					{/if}
+					{safeTranslate(data.scenario.current_level.name)}
 				</span>
 			</p>
 		</div>
@@ -193,11 +181,7 @@
 					class="text-sm text-center font-semibold p-2 rounded-md w-20"
 					style="background-color: {color_map[data.scenario.residual_proba]}"
 				>
-					{#if safeTranslate(toCamelCase(data.scenario.residual_proba.name))}
-						{safeTranslate(toCamelCase(data.scenario.residual_proba.name))}
-					{:else}
-						{data.scenario.residual_proba.name}
-					{/if}
+					{safeTranslate(data.scenario.residual_proba.name)}
 				</span>
 			</p>
 			<i class="fa-solid fa-xmark mt-5" />
@@ -207,11 +191,7 @@
 					class="text-sm text-center font-semibold p-2 rounded-md w-20"
 					style="background-color: {color_map[data.scenario.residual_impact]}"
 				>
-					{#if safeTranslate(toCamelCase(data.scenario.residual_impact.name))}
-						{safeTranslate(toCamelCase(data.scenario.residual_impact.name))}
-					{:else}
-						{data.scenario.residual_impact.name}
-					{/if}
+					{safeTranslate(data.scenario.residual_impact.name)}
 				</span>
 			</p>
 			<i class="fa-solid fa-equals mt-5" />
@@ -225,11 +205,7 @@
 					)}"
 					style="background-color: {data.scenario.residual_level.hexcolor}"
 				>
-					{#if safeTranslate(toCamelCase(data.scenario.residual_level.name))}
-						{safeTranslate(toCamelCase(data.scenario.residual_level.name))}
-					{:else}
-						{data.scenario.residual_level.name}
-					{/if}
+					{safeTranslate(data.scenario.residual_level.name)}
 				</span>
 			</p>
 		</div>
@@ -241,9 +217,8 @@
 				<span class="font-semibold">
 					{#each data.scenario.qualifications as qualification, i}
 						{#if i > 0},{/if}
-						{safeTranslate(toCamelCase(qualification)) ||
-							qualification ||
-							safeTranslate('undefined')}
+						{safeTranslate(qualification) ||
+							m.undefined()}
 					{/each}
 				</span>
 			</p>
@@ -255,11 +230,7 @@
 					{data.scenario.strength_of_knowledge.symbol}
 				{/if}
 				<span class="font-semibold">
-					{#if safeTranslate(toCamelCase(data.scenario.strength_of_knowledge.name))}
-						{safeTranslate(toCamelCase(data.scenario.strength_of_knowledge.name))}
-					{:else}
-						{safeTranslate('undefined')}
-					{/if}
+					{safeTranslate(data.scenario.strength_of_knowledge.name) || m.undefined()}
 				</span>
 			</p>
 		</div>
diff --git a/frontend/src/routes/(app)/(internal)/risk-scenarios/[id=uuid]/edit/RiskLevel.svelte b/frontend/src/routes/(app)/(internal)/risk-scenarios/[id=uuid]/edit/RiskLevel.svelte
index ecdba0cca..1a55edf92 100644
--- a/frontend/src/routes/(app)/(internal)/risk-scenarios/[id=uuid]/edit/RiskLevel.svelte
+++ b/frontend/src/routes/(app)/(internal)/risk-scenarios/[id=uuid]/edit/RiskLevel.svelte
@@ -61,11 +61,7 @@
 			)}"
 			style="background-color: {riskLevel.hexcolor}"
 		>
-			{#if safeTranslate(toCamelCase(riskLevel.name))}
-				{safeTranslate(toCamelCase(riskLevel.name))}
-			{:else}
-				{riskLevel.name}
-			{/if}
+			{safeTranslate(riskLevel.name)}
 		</div>
 	{:else}
 		<div class="flex font-medium w-32 justify-center p-2 rounded-token bg-gray-300">--</div>
diff --git a/frontend/src/routes/(app)/(third-party)/compliance-assessments/[id=uuid]/+page.svelte b/frontend/src/routes/(app)/(third-party)/compliance-assessments/[id=uuid]/+page.svelte
index 79fb6c824..4962f10f1 100644
--- a/frontend/src/routes/(app)/(third-party)/compliance-assessments/[id=uuid]/+page.svelte
+++ b/frontend/src/routes/(app)/(third-party)/compliance-assessments/[id=uuid]/+page.svelte
@@ -200,11 +200,7 @@
 						class="text-sm font-medium text-gray-800 capitalize-first"
 						data-testid={key.replaceAll('_', '-') + '-field-title'}
 					>
-						{#if key === 'urn'}
-							{m.urn()}
-						{:else}
-							{safeTranslate(toCamelCase(key))}
-						{/if}
+						{safeTranslate(key)}
 					</div>
 					<ul class="text-sm">
 						<li
@@ -244,10 +240,8 @@
 									{:else}
 										{value.str}
 									{/if}
-								{:else if safeTranslate(toCamelCase(value.str ?? value))}
-									{safeTranslate(toCamelCase(value.str ?? value))}
 								{:else}
-									{value.str ?? value}
+									{safeTranslate(value.str ?? value)}
 								{/if}
 							{:else}
 								--
diff --git a/frontend/src/routes/(app)/(third-party)/evidences/[id=uuid]/+page.svelte b/frontend/src/routes/(app)/(third-party)/evidences/[id=uuid]/+page.svelte
index 39ed28236..484704593 100644
--- a/frontend/src/routes/(app)/(third-party)/evidences/[id=uuid]/+page.svelte
+++ b/frontend/src/routes/(app)/(third-party)/evidences/[id=uuid]/+page.svelte
@@ -73,7 +73,7 @@
 						class="text-sm font-medium text-gray-800 capitalize-first"
 						data-testid={key.replace('_', '-') + '-field-title'}
 					>
-						{safeTranslate(toCamelCase(key))}
+						{safeTranslate(key)}
 					</div>
 					<ul class="text-sm">
 						<li

From 64d247e58b8b3363425b691140c1f0fac1f49b84 Mon Sep 17 00:00:00 2001
From: monsieurswag <mael.joumier@intuitem.com>
Date: Thu, 17 Oct 2024 21:14:47 +0200
Subject: [PATCH 07/14] Formatter

---
 .../(app)/(internal)/risk-assessments/[id=uuid]/+page.svelte  | 4 +---
 .../(app)/(internal)/risk-scenarios/[id=uuid]/+page.svelte    | 3 +--
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/frontend/src/routes/(app)/(internal)/risk-assessments/[id=uuid]/+page.svelte b/frontend/src/routes/(app)/(internal)/risk-assessments/[id=uuid]/+page.svelte
index 00d83a599..826f7bbbf 100644
--- a/frontend/src/routes/(app)/(internal)/risk-assessments/[id=uuid]/+page.svelte
+++ b/frontend/src/routes/(app)/(internal)/risk-assessments/[id=uuid]/+page.svelte
@@ -164,9 +164,7 @@
 					<ul>
 						<li class="pb-1">
 							<span class="font-semibold">{m.status()}:</span>
-							{risk_assessment.status === null
-								? '--'
-								: safeTranslate(risk_assessment.status)}
+							{risk_assessment.status === null ? '--' : safeTranslate(risk_assessment.status)}
 						</li>
 						<li class="pb-1">
 							<span class="font-semibold">{m.authors()}:</span>
diff --git a/frontend/src/routes/(app)/(internal)/risk-scenarios/[id=uuid]/+page.svelte b/frontend/src/routes/(app)/(internal)/risk-scenarios/[id=uuid]/+page.svelte
index c6d60919d..9acdae825 100644
--- a/frontend/src/routes/(app)/(internal)/risk-scenarios/[id=uuid]/+page.svelte
+++ b/frontend/src/routes/(app)/(internal)/risk-scenarios/[id=uuid]/+page.svelte
@@ -217,8 +217,7 @@
 				<span class="font-semibold">
 					{#each data.scenario.qualifications as qualification, i}
 						{#if i > 0},{/if}
-						{safeTranslate(qualification) ||
-							m.undefined()}
+						{safeTranslate(qualification) || m.undefined()}
 					{/each}
 				</span>
 			</p>

From 45ffe38347278ca722bc6d6696f810cfabfd9f83 Mon Sep 17 00:00:00 2001
From: monsieurswag <mael.joumier@intuitem.com>
Date: Thu, 17 Oct 2024 21:18:42 +0200
Subject: [PATCH 08/14] Remove useless capitalization usage in dynamic
 translations

---
 frontend/src/lib/components/DetailView/DetailView.svelte    | 6 +++---
 .../routes/(app)/(internal)/[model=urlmodel]/+page.svelte   | 6 +++---
 .../(internal)/risk-scenarios/[id=uuid]/edit/+page.svelte   | 2 +-
 .../(third-party)/[model=thirdparty_urlmodels]/+page.svelte | 6 +++---
 .../[id=uuid]/table-mode/+page.svelte                       | 2 +-
 .../requirement-assessments/[id=uuid]/edit/+page.svelte     | 4 ++--
 6 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/frontend/src/lib/components/DetailView/DetailView.svelte b/frontend/src/lib/components/DetailView/DetailView.svelte
index bfa5101e4..248aa66fd 100644
--- a/frontend/src/lib/components/DetailView/DetailView.svelte
+++ b/frontend/src/lib/components/DetailView/DetailView.svelte
@@ -85,7 +85,7 @@
 			type: 'component',
 			component: modalComponent,
 			// Data
-			title: safeTranslate('add' + capitalizeFirstLetter(model.info.localName))
+			title: safeTranslate('add-' + model.info.localName)
 		};
 		if (checkConstraints(model.createForm.constraints, model.foreignKeys).length > 0) {
 			modalComponent = {
@@ -95,7 +95,7 @@
 				type: 'component',
 				component: modalComponent,
 				title: m.warning(),
-				body: safeTranslate('add' + capitalizeFirstLetter(model.info.localName)).toLowerCase(),
+				body: safeTranslate('add-' + model.info.localName).toLowerCase(),
 				value: checkConstraints(model.createForm.constraints, model.foreignKeys)
 			};
 		}
@@ -330,7 +330,7 @@
 					{#if tabSet === index}
 						<div class="flex flex-row justify-between px-4 py-2">
 							<h4 class="font-semibold lowercase capitalize-first my-auto">
-								{safeTranslate('associated' + capitalizeFirstLetter(model.info.localNamePlural))}
+								{safeTranslate('associated-' + model.info.localNamePlural)}
 							</h4>
 						</div>
 						{#if model.table}
diff --git a/frontend/src/routes/(app)/(internal)/[model=urlmodel]/+page.svelte b/frontend/src/routes/(app)/(internal)/[model=urlmodel]/+page.svelte
index 5212eb855..6369d61be 100644
--- a/frontend/src/routes/(app)/(internal)/[model=urlmodel]/+page.svelte
+++ b/frontend/src/routes/(app)/(internal)/[model=urlmodel]/+page.svelte
@@ -27,7 +27,7 @@
 			type: 'component',
 			component: modalComponent,
 			// Data
-			title: safeTranslate('add' + capitalizeFirstLetter(data.model.localName))
+			title: safeTranslate('add-' + data.model.localName)
 		};
 		if (checkConstraints(data.createForm.constraints, data.model.foreignKeys).length > 0) {
 			modalComponent = {
@@ -37,7 +37,7 @@
 				type: 'component',
 				component: modalComponent,
 				title: m.warning(),
-				body: safeTranslate('add' + capitalizeFirstLetter(data.model.localName)).toLowerCase(),
+				body: safeTranslate('add-' + data.model.localName).toLowerCase(),
 				value: checkConstraints(data.createForm.constraints, data.model.foreignKeys)
 			};
 		}
@@ -56,7 +56,7 @@
 							data-testid="add-button"
 							on:click={modalCreateForm}
 							><i class="fa-solid fa-plus mr-2" />
-							{safeTranslate('add' + capitalizeFirstLetter(data.model.localName))}
+							{safeTranslate('add-' + data.model.localName)}
 						</button>
 						{#if URLModel === 'applied-controls'}
 							<a
diff --git a/frontend/src/routes/(app)/(internal)/risk-scenarios/[id=uuid]/edit/+page.svelte b/frontend/src/routes/(app)/(internal)/risk-scenarios/[id=uuid]/edit/+page.svelte
index bd6c902e9..b462808f0 100644
--- a/frontend/src/routes/(app)/(internal)/risk-scenarios/[id=uuid]/edit/+page.svelte
+++ b/frontend/src/routes/(app)/(internal)/risk-scenarios/[id=uuid]/edit/+page.svelte
@@ -73,7 +73,7 @@
 			type: 'component',
 			component: modalComponent,
 			// Data
-			title: safeTranslate('add' + capitalizeFirstLetter(data.measureModel.localName))
+			title: safeTranslate('add-' + data.measureModel.localName)
 		};
 		modalStore.trigger(modal);
 	}
diff --git a/frontend/src/routes/(app)/(third-party)/[model=thirdparty_urlmodels]/+page.svelte b/frontend/src/routes/(app)/(third-party)/[model=thirdparty_urlmodels]/+page.svelte
index dcf49cb4b..dbc8bca09 100644
--- a/frontend/src/routes/(app)/(third-party)/[model=thirdparty_urlmodels]/+page.svelte
+++ b/frontend/src/routes/(app)/(third-party)/[model=thirdparty_urlmodels]/+page.svelte
@@ -27,7 +27,7 @@
 			type: 'component',
 			component: modalComponent,
 			// Data
-			title: safeTranslate('add' + capitalizeFirstLetter(data.model.localName))
+			title: safeTranslate('add-' + data.model.localName)
 		};
 		if (checkConstraints(data.createForm.constraints, data.model.foreignKeys).length > 0) {
 			modalComponent = {
@@ -37,7 +37,7 @@
 				type: 'component',
 				component: modalComponent,
 				title: m.warning(),
-				body: safeTranslate('add' + capitalizeFirstLetter(data.model.localName)).toLowerCase(),
+				body: safeTranslate('add-' + data.model.localName).toLowerCase(),
 				value: checkConstraints(data.createForm.constraints, data.model.foreignKeys)
 			};
 		}
@@ -56,7 +56,7 @@
 							data-testid="add-button"
 							on:click={modalCreateForm}
 							><i class="fa-solid fa-plus mr-2" />
-							{safeTranslate('add' + capitalizeFirstLetter(data.model.localName))}
+							{safeTranslate('add-' + data.model.localName)}
 						</button>
 						{#if URLModel === 'applied-controls'}
 							<a
diff --git a/frontend/src/routes/(app)/(third-party)/compliance-assessments/[id=uuid]/table-mode/+page.svelte b/frontend/src/routes/(app)/(third-party)/compliance-assessments/[id=uuid]/table-mode/+page.svelte
index 8c5756e69..aafd4576f 100644
--- a/frontend/src/routes/(app)/(third-party)/compliance-assessments/[id=uuid]/table-mode/+page.svelte
+++ b/frontend/src/routes/(app)/(third-party)/compliance-assessments/[id=uuid]/table-mode/+page.svelte
@@ -105,7 +105,7 @@
 		const modal: ModalSettings = {
 			type: 'component',
 			component: modalComponent,
-			title: safeTranslate('add' + capitalizeFirstLetter(data.evidenceModel.localName))
+			title: safeTranslate('add-' + data.evidenceModel.localName)
 		};
 		modalStore.trigger(modal);
 	}
diff --git a/frontend/src/routes/(app)/(third-party)/requirement-assessments/[id=uuid]/edit/+page.svelte b/frontend/src/routes/(app)/(third-party)/requirement-assessments/[id=uuid]/edit/+page.svelte
index d604b2c09..15b74b7b2 100644
--- a/frontend/src/routes/(app)/(third-party)/requirement-assessments/[id=uuid]/edit/+page.svelte
+++ b/frontend/src/routes/(app)/(third-party)/requirement-assessments/[id=uuid]/edit/+page.svelte
@@ -87,7 +87,7 @@
 			type: 'component',
 			component: modalComponent,
 			// Data
-			title: safeTranslate('add' + capitalizeFirstLetter(data.measureModel.localName))
+			title: safeTranslate('add-' + data.measureModel.localName)
 		};
 		modalStore.trigger(modal);
 	}
@@ -106,7 +106,7 @@
 			type: 'component',
 			component: modalComponent,
 			// Data
-			title: safeTranslate('add' + capitalizeFirstLetter(data.evidenceModel.localName))
+			title: safeTranslate('add-' + data.evidenceModel.localName)
 		};
 		modalStore.trigger(modal);
 	}

From 2dea9542b585747123247b20ec38f83c41241136 Mon Sep 17 00:00:00 2001
From: monsieurswag <mael.joumier@intuitem.com>
Date: Thu, 17 Oct 2024 21:20:16 +0200
Subject: [PATCH 09/14] Completly remove capitalizeFirstLetter from the
 codebase

---
 frontend/src/lib/components/DetailView/DetailView.svelte      | 4 ++--
 frontend/src/lib/utils/locales.ts                             | 4 ----
 .../src/routes/(app)/(internal)/[model=urlmodel]/+page.svelte | 1 -
 .../(internal)/risk-scenarios/[id=uuid]/edit/+page.svelte     | 1 -
 .../(third-party)/[model=thirdparty_urlmodels]/+page.svelte   | 1 -
 .../compliance-assessments/[id=uuid]/table-mode/+page.svelte  | 2 --
 .../requirement-assessments/[id=uuid]/edit/+page.svelte       | 1 -
 7 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/frontend/src/lib/components/DetailView/DetailView.svelte b/frontend/src/lib/components/DetailView/DetailView.svelte
index 248aa66fd..524c03880 100644
--- a/frontend/src/lib/components/DetailView/DetailView.svelte
+++ b/frontend/src/lib/components/DetailView/DetailView.svelte
@@ -17,7 +17,7 @@
 	import { getModelInfo } from '$lib/utils/crud.js';
 	import { URL_MODEL_MAP } from '$lib/utils/crud';
 	import { isURL } from '$lib/utils/helpers';
-	import { toCamelCase, capitalizeFirstLetter } from '$lib/utils/locales.js';
+	import { toCamelCase } from '$lib/utils/locales.js';
 	import { checkConstraints } from '$lib/utils/crud';
 	import { languageTag } from '$paraglide/runtime.js';
 	import * as m from '$paraglide/messages.js';
@@ -340,7 +340,7 @@
 									class="btn variant-filled-primary self-end my-auto"
 									on:click={(_) => modalCreateForm(model)}
 									><i class="fa-solid fa-plus mr-2 lowercase" />{safeTranslate(
-										'add' + capitalizeFirstLetter(model.info.localName)
+										'add-' + model.info.localName
 									)}</button
 								>
 							</ModelTable>
diff --git a/frontend/src/lib/utils/locales.ts b/frontend/src/lib/utils/locales.ts
index 43e03bf85..4ae366f21 100644
--- a/frontend/src/lib/utils/locales.ts
+++ b/frontend/src/lib/utils/locales.ts
@@ -54,7 +54,3 @@ export function toCamelCase(str: string) {
 	str = str.charAt(0).toLowerCase() + str.slice(1);
 	return str.replace(/[_-\s]\w/g, (match) => match.charAt(1).toUpperCase());
 }
-
-export function capitalizeFirstLetter(str: string) {
-	return str.charAt(0).toUpperCase() + str.slice(1);
-}
diff --git a/frontend/src/routes/(app)/(internal)/[model=urlmodel]/+page.svelte b/frontend/src/routes/(app)/(internal)/[model=urlmodel]/+page.svelte
index 6369d61be..a1e1d2b8e 100644
--- a/frontend/src/routes/(app)/(internal)/[model=urlmodel]/+page.svelte
+++ b/frontend/src/routes/(app)/(internal)/[model=urlmodel]/+page.svelte
@@ -7,7 +7,6 @@
 	import { getModalStore } from '@skeletonlabs/skeleton';
 	import type { PageData } from './$types';
 	import * as m from '$paraglide/messages';
-	import { capitalizeFirstLetter } from '$lib/utils/locales';
 	import { checkConstraints } from '$lib/utils/crud';
 
 	export let data: PageData;
diff --git a/frontend/src/routes/(app)/(internal)/risk-scenarios/[id=uuid]/edit/+page.svelte b/frontend/src/routes/(app)/(internal)/risk-scenarios/[id=uuid]/edit/+page.svelte
index b462808f0..88aa2f5dd 100644
--- a/frontend/src/routes/(app)/(internal)/risk-scenarios/[id=uuid]/edit/+page.svelte
+++ b/frontend/src/routes/(app)/(internal)/risk-scenarios/[id=uuid]/edit/+page.svelte
@@ -27,7 +27,6 @@
 	import { page } from '$app/stores';
 
 	import * as m from '$paraglide/messages';
-	import { capitalizeFirstLetter } from '$lib/utils/locales';
 	import { safeTranslate } from '$lib/utils/i18n';
 	import { languageTag } from '$paraglide/runtime';
 	import { zod } from 'sveltekit-superforms/adapters';
diff --git a/frontend/src/routes/(app)/(third-party)/[model=thirdparty_urlmodels]/+page.svelte b/frontend/src/routes/(app)/(third-party)/[model=thirdparty_urlmodels]/+page.svelte
index dbc8bca09..7c992a269 100644
--- a/frontend/src/routes/(app)/(third-party)/[model=thirdparty_urlmodels]/+page.svelte
+++ b/frontend/src/routes/(app)/(third-party)/[model=thirdparty_urlmodels]/+page.svelte
@@ -7,7 +7,6 @@
 	import { getModalStore } from '@skeletonlabs/skeleton';
 	import type { PageData } from './$types';
 	import * as m from '$paraglide/messages';
-	import { capitalizeFirstLetter } from '$lib/utils/locales';
 	import { checkConstraints } from '$lib/utils/crud';
 
 	export let data: PageData;
diff --git a/frontend/src/routes/(app)/(third-party)/compliance-assessments/[id=uuid]/table-mode/+page.svelte b/frontend/src/routes/(app)/(third-party)/compliance-assessments/[id=uuid]/table-mode/+page.svelte
index aafd4576f..930e7cd7e 100644
--- a/frontend/src/routes/(app)/(third-party)/compliance-assessments/[id=uuid]/table-mode/+page.svelte
+++ b/frontend/src/routes/(app)/(third-party)/compliance-assessments/[id=uuid]/table-mode/+page.svelte
@@ -20,9 +20,7 @@
 	import CreateModal from '$lib/components/Modals/CreateModal.svelte';
 	import DeleteConfirmModal from '$lib/components/Modals/DeleteConfirmModal.svelte';
 	import { safeTranslate } from '$lib/utils/i18n';
-	import { capitalizeFirstLetter } from '$lib/utils/locales';
 	import { getModelInfo } from '$lib/utils/crud';
-	import { page } from '$app/stores';
 
 	export let data: PageData;
 	export let form: Actions;
diff --git a/frontend/src/routes/(app)/(third-party)/requirement-assessments/[id=uuid]/edit/+page.svelte b/frontend/src/routes/(app)/(third-party)/requirement-assessments/[id=uuid]/edit/+page.svelte
index 15b74b7b2..c9da5a0f9 100644
--- a/frontend/src/routes/(app)/(third-party)/requirement-assessments/[id=uuid]/edit/+page.svelte
+++ b/frontend/src/routes/(app)/(third-party)/requirement-assessments/[id=uuid]/edit/+page.svelte
@@ -40,7 +40,6 @@
 	import { superForm } from 'sveltekit-superforms';
 
 	import { complianceResultColorMap } from '$lib/utils/constants';
-	import { capitalizeFirstLetter } from '$lib/utils/locales';
 	import { hideSuggestions } from '$lib/utils/stores';
 	import * as m from '$paraglide/messages';
 

From ddb7ea9dc7e20c6904361bf0ab1a65d163963cba Mon Sep 17 00:00:00 2001
From: monsieurswag <mael.joumier@intuitem.com>
Date: Fri, 18 Oct 2024 10:57:47 +0200
Subject: [PATCH 10/14] Remove some useless unsafeTranslate usage

---
 frontend/src/lib/components/Forms/AutocompleteSelect.svelte | 4 ++--
 frontend/src/lib/components/ModelTable/ModelTable.svelte    | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/frontend/src/lib/components/Forms/AutocompleteSelect.svelte b/frontend/src/lib/components/Forms/AutocompleteSelect.svelte
index 096a50307..e6eadfef6 100644
--- a/frontend/src/lib/components/Forms/AutocompleteSelect.svelte
+++ b/frontend/src/lib/components/Forms/AutocompleteSelect.svelte
@@ -120,8 +120,8 @@
 				{#if option.suggested}
 					<span class="text-indigo-600">{option.label}</span>
 					<span class="text-sm text-gray-500"> (suggested)</span>
-				{:else if translateOptions && unsafeTranslate(option.label)}
-					{unsafeTranslate(option.label)}
+				{:else if translateOptions}
+					{safeTranslate(option.label)}
 				{:else}
 					{option.label}
 				{/if}
diff --git a/frontend/src/lib/components/ModelTable/ModelTable.svelte b/frontend/src/lib/components/ModelTable/ModelTable.svelte
index b4f0bd4d7..9ce60f00d 100644
--- a/frontend/src/lib/components/ModelTable/ModelTable.svelte
+++ b/frontend/src/lib/components/ModelTable/ModelTable.svelte
@@ -282,7 +282,7 @@
 		<thead class="table-head {regionHead}">
 			<tr>
 				{#each Object.entries(source.head) as [key, heading]}
-					<Th {handler} orderBy={key} class="{regionHeadCell}">{unsafeTranslate(heading) ?? heading}</Th>
+					<Th {handler} orderBy={key} class="{regionHeadCell}">{safeTranslate(heading)}</Th>
 				{/each}
         {#if displayActions}
         <th class="{regionHeadCell} select-none text-end"></th>

From f7434494b795aa8efd95f8cc7508b09707b9ec72 Mon Sep 17 00:00:00 2001
From: monsieurswag <mael.joumier@intuitem.com>
Date: Fri, 18 Oct 2024 10:59:08 +0200
Subject: [PATCH 11/14] Make a line cleaner

---
 frontend/src/lib/components/ModelTable/ModelTable.svelte | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/lib/components/ModelTable/ModelTable.svelte b/frontend/src/lib/components/ModelTable/ModelTable.svelte
index 9ce60f00d..41d05e1f4 100644
--- a/frontend/src/lib/components/ModelTable/ModelTable.svelte
+++ b/frontend/src/lib/components/ModelTable/ModelTable.svelte
@@ -368,7 +368,7 @@
                   {/if}
                 {:else if value && value.hexcolor}
                   <p class="flex w-fit min-w-24 justify-center px-2 py-1 rounded-md ml-2 whitespace-nowrap {classesHexBackgroundText(value.hexcolor)}" style="background-color: {value.hexcolor}">
-										{safeTranslate(value.name ?? value.str ?? '-')}
+										{safeTranslate(value.name ?? value.str) ?? '-'}
                   </p>
 				{:else if ISO_8601_REGEX.test(value)}
 									{formatDateOrDateTime(value, languageTag())}

From 94fff4ed3b0192accab76edc28213407f29061a3 Mon Sep 17 00:00:00 2001
From: monsieurswag <mael.joumier@intuitem.com>
Date: Fri, 18 Oct 2024 21:22:22 +0200
Subject: [PATCH 12/14] Remove useless import

---
 frontend/src/lib/components/Forms/AutocompleteSelect.svelte | 1 -
 1 file changed, 1 deletion(-)

diff --git a/frontend/src/lib/components/Forms/AutocompleteSelect.svelte b/frontend/src/lib/components/Forms/AutocompleteSelect.svelte
index e6eadfef6..12e58aa3b 100644
--- a/frontend/src/lib/components/Forms/AutocompleteSelect.svelte
+++ b/frontend/src/lib/components/Forms/AutocompleteSelect.svelte
@@ -1,6 +1,5 @@
 <script lang="ts">
 	import { formFieldProxy } from 'sveltekit-superforms';
-	import { unsafeTranslate } from '$lib/utils/i18n';
 	import type { CacheLock } from '$lib/utils/types';
 	import { onMount } from 'svelte';
 

From 7e6327fe6a6ab645a84babf238705f2927fde2ff Mon Sep 17 00:00:00 2001
From: monsieurswag <mael.joumier@intuitem.com>
Date: Sat, 19 Oct 2024 14:11:24 +0200
Subject: [PATCH 13/14] Add missing import

---
 frontend/src/lib/components/Forms/AutocompleteSelect.svelte | 1 +
 1 file changed, 1 insertion(+)

diff --git a/frontend/src/lib/components/Forms/AutocompleteSelect.svelte b/frontend/src/lib/components/Forms/AutocompleteSelect.svelte
index 12e58aa3b..d8d5a234e 100644
--- a/frontend/src/lib/components/Forms/AutocompleteSelect.svelte
+++ b/frontend/src/lib/components/Forms/AutocompleteSelect.svelte
@@ -2,6 +2,7 @@
 	import { formFieldProxy } from 'sveltekit-superforms';
 	import type { CacheLock } from '$lib/utils/types';
 	import { onMount } from 'svelte';
+	import { safeTranslate } from '$lib/utils/i18n';
 
 	interface Option {
 		label: string;

From ccc20019938d8e3142fb3b81af88c6ee1d2d49c7 Mon Sep 17 00:00:00 2001
From: monsieurswag <mael.joumier@intuitem.com>
Date: Sat, 19 Oct 2024 15:30:24 +0200
Subject: [PATCH 14/14] Fix broken model table text display

---
 frontend/src/lib/components/ModelTable/ModelTable.svelte | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/lib/components/ModelTable/ModelTable.svelte b/frontend/src/lib/components/ModelTable/ModelTable.svelte
index 41d05e1f4..76e671426 100644
--- a/frontend/src/lib/components/ModelTable/ModelTable.svelte
+++ b/frontend/src/lib/components/ModelTable/ModelTable.svelte
@@ -373,7 +373,7 @@
 				{:else if ISO_8601_REGEX.test(value)}
 									{formatDateOrDateTime(value, languageTag())}
                 {:else}
-						{unsafeTranslate(value) ?? '-'}
+						{safeTranslate(value ?? '-')}
                 {/if}
                 </span>
 							{/if}