diff --git a/frontend/src/lib/components/Breadcrumbs/Breadcrumbs.svelte b/frontend/src/lib/components/Breadcrumbs/Breadcrumbs.svelte index a46e750e3..3eec3d490 100644 --- a/frontend/src/lib/components/Breadcrumbs/Breadcrumbs.svelte +++ b/frontend/src/lib/components/Breadcrumbs/Breadcrumbs.svelte @@ -65,8 +65,8 @@ {#if c.icon} {/if} - {#if localItems()[c.label]} - {localItems()[c.label]} + {#if m[c.label]} + {m[c.label]()} {:else} {c.label} {/if} @@ -82,8 +82,8 @@ {#if c.icon} {/if} - {#if localItems()[c.label]} - {localItems()[c.label]} + {#if m[c.label]} + {m[c.label]()} {:else} {c.label} {/if} @@ -93,8 +93,8 @@ {#if c.icon} {/if} - {#if localItems()[c.label]} - {localItems()[c.label]} + {#if m[c.label]()} + {m[c.label]()} {:else} {c.label} {/if} diff --git a/frontend/src/lib/components/Forms/AutocompleteSelect.svelte b/frontend/src/lib/components/Forms/AutocompleteSelect.svelte index f57f0107c..9597ad6b3 100644 --- a/frontend/src/lib/components/Forms/AutocompleteSelect.svelte +++ b/frontend/src/lib/components/Forms/AutocompleteSelect.svelte @@ -1,7 +1,7 @@ -{cell.folder} - {localItems()[toCamelCase(cell.role)]} +{cell.folder} - {m[toCamelCase(cell.role)]() ?? cell.role} diff --git a/frontend/src/lib/components/SideBar/SideBarCategory.svelte b/frontend/src/lib/components/SideBar/SideBarCategory.svelte index b6392f9d6..b82fd3a1c 100644 --- a/frontend/src/lib/components/SideBar/SideBarCategory.svelte +++ b/frontend/src/lib/components/SideBar/SideBarCategory.svelte @@ -1,9 +1,8 @@ - {localItems()[item.name]} + {m[item.name]()} diff --git a/frontend/src/lib/components/SideBar/SideBarItem.svelte b/frontend/src/lib/components/SideBar/SideBarItem.svelte index 4c98403af..481719876 100644 --- a/frontend/src/lib/components/SideBar/SideBarItem.svelte +++ b/frontend/src/lib/components/SideBar/SideBarItem.svelte @@ -26,7 +26,7 @@ > - {localItems()[item.name]} + {m[item.name]()} {/each} diff --git a/frontend/src/routes/(app)/+layout.svelte b/frontend/src/routes/(app)/+layout.svelte index c803e71bc..c263222bd 100644 --- a/frontend/src/routes/(app)/+layout.svelte +++ b/frontend/src/routes/(app)/+layout.svelte @@ -8,7 +8,7 @@ import { pageTitle } from '$lib/utils/stores'; import { localItems } from '$lib/utils/locales'; - import { languageTag } from '$paraglide/runtime'; + import * as m from '$paraglide/messages.js'; let sidebarOpen = true; @@ -26,8 +26,8 @@ - {#if localItems()[$pageTitle]} - {localItems()[$pageTitle]} + {#if $pageTitle && m[$pageTitle]} + {m[$pageTitle]() ?? $pageTitle} {:else} {$pageTitle} {/if} diff --git a/frontend/src/routes/(app)/[model=urlmodel]/+page.server.ts b/frontend/src/routes/(app)/[model=urlmodel]/+page.server.ts index 5d2952b58..968b96859 100644 --- a/frontend/src/routes/(app)/[model=urlmodel]/+page.server.ts +++ b/frontend/src/routes/(app)/[model=urlmodel]/+page.server.ts @@ -190,7 +190,7 @@ export const actions: Actions = { const response = await res.json(); console.log(response); if (response.error) { - setFlash({ type: 'error', message: localItems()[response.error] }, event); + setFlash({ type: 'error', message: m[response.error]() }, event); return fail(403, { form: deleteForm }); } if (response.non_field_errors) { diff --git a/frontend/src/routes/(app)/[model=urlmodel]/+page.svelte b/frontend/src/routes/(app)/[model=urlmodel]/+page.svelte index 06f4e277a..6b7d50abf 100644 --- a/frontend/src/routes/(app)/[model=urlmodel]/+page.svelte +++ b/frontend/src/routes/(app)/[model=urlmodel]/+page.svelte @@ -54,7 +54,7 @@ data-testid="add-button" on:click={modalCreateForm} > - {localItems()['add' + capitalizeFirstLetter(data.model.localName)]} + {m['add' + capitalizeFirstLetter(data.model.localName)]()} {:else if data.URLModel === 'risk-matrices'} - {localItems()[toCamelCase(key)]} + {m[toCamelCase(key)]() ?? key}
  • {value} {:else if ISO_8601_REGEX.test(value)} {formatDateOrDateTime(value, languageTag())} - {:else if localItems()[toCamelCase((value.str || value.name) ?? value)]} - {localItems()[toCamelCase((value.str || value.name) ?? value)]} + {:else if m[toCamelCase((value.str || value.name) ?? value)]} + {m[toCamelCase((value.str || value.name) ?? value)]()} {:else} {(value.str || value.name) ?? value} {/if} @@ -261,7 +261,7 @@ {#each Object.entries(data.relatedModels) as [urlmodel, model], index} - {localItems()[model.info.localNamePlural]} + {m[model.info.localNamePlural]()} {#if model.table.body.length > 0} {model.table.body.length} {/if} @@ -272,7 +272,7 @@ {#if tabSet === index}

    - {localItems()['associated' + capitalizeFirstLetter(model.info.localNamePlural)]} + {m['associated' + capitalizeFirstLetter(model.info.localNamePlural)]()}

    {#if model.table} diff --git a/frontend/src/routes/(app)/compliance-assessments/[id=uuid]/+page.svelte b/frontend/src/routes/(app)/compliance-assessments/[id=uuid]/+page.svelte index e4fb6b2c6..f265f28b1 100644 --- a/frontend/src/routes/(app)/compliance-assessments/[id=uuid]/+page.svelte +++ b/frontend/src/routes/(app)/compliance-assessments/[id=uuid]/+page.svelte @@ -124,7 +124,7 @@ {#if key === 'urn'} {m.urn()} {:else} - {localItems()[toCamelCase(key)]} + {m[toCamelCase(key)]() ?? key} {/if}
      @@ -157,8 +157,8 @@ )?.urlModel }/${value.id}`} {value.str} - {:else if localItems()[toCamelCase(value.str ?? value)]} - {localItems()[toCamelCase(value.str ?? value)]} + {:else if m[toCamelCase(value.str ?? value)]()} + {m[toCamelCase(value.str ?? value)]() ?? value.str ?? value} {:else} {value.str ?? value} {/if} diff --git a/frontend/src/routes/(app)/evidences/[id=uuid]/+page.svelte b/frontend/src/routes/(app)/evidences/[id=uuid]/+page.svelte index 7f21481c1..9847e03cd 100644 --- a/frontend/src/routes/(app)/evidences/[id=uuid]/+page.svelte +++ b/frontend/src/routes/(app)/evidences/[id=uuid]/+page.svelte @@ -79,7 +79,7 @@ class="text-sm font-medium text-gray-800 capitalize-first" data-testid={key.replace('_', '-') + '-field-title'} > - {localItems()[toCamelCase(key)]} + {m[toCamelCase(key)]() ?? key}
        • diff --git a/frontend/src/routes/(app)/my-profile/+page.svelte b/frontend/src/routes/(app)/my-profile/+page.svelte index f81383328..b2d369057 100644 --- a/frontend/src/routes/(app)/my-profile/+page.svelte +++ b/frontend/src/routes/(app)/my-profile/+page.svelte @@ -46,7 +46,7 @@
          {#each Object.entries(filterUserData()) as [label, value]}
          -

          {localItems()[label]}

          +

          {m[label]()}

          {value}

          {/each} diff --git a/frontend/src/routes/(app)/risk-assessments/[id=uuid]/+page.svelte b/frontend/src/routes/(app)/risk-assessments/[id=uuid]/+page.svelte index 9dda1a455..dd0fafb20 100644 --- a/frontend/src/routes/(app)/risk-assessments/[id=uuid]/+page.svelte +++ b/frontend/src/routes/(app)/risk-assessments/[id=uuid]/+page.svelte @@ -214,9 +214,7 @@
          • {m.status()}: - {risk_assessment.status === null - ? '--' - : localItems()[toCamelCase(risk_assessment.status)]} + {risk_assessment.status === null ? '--' : m[toCamelCase(risk_assessment.status)]()}
          • {m.authors()}: diff --git a/frontend/src/routes/(app)/risk-scenarios/[id=uuid]/+page.svelte b/frontend/src/routes/(app)/risk-scenarios/[id=uuid]/+page.svelte index 0a20f188b..04a60188d 100644 --- a/frontend/src/routes/(app)/risk-scenarios/[id=uuid]/+page.svelte +++ b/frontend/src/routes/(app)/risk-scenarios/[id=uuid]/+page.svelte @@ -85,7 +85,7 @@

            {m.treatmentStatus()}

            - {localItems()[toCamelCase(data.scenario.treatment)]} + {m[toCamelCase(data.scenario.treatment)]() ?? data.scenario.treatment}

          @@ -120,8 +120,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)]} - {localItems()[toCamelCase(data.scenario.current_proba)]} + {#if m[toCamelCase(data.scenario.current_proba)]()} + {m[toCamelCase(data.scenario.current_proba)]() ?? data.scenario.current_proba} {:else} {data.scenario.current_proba} {/if} @@ -134,8 +134,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)]} - {localItems()[toCamelCase(data.scenario.current_impact)]} + {#if m[toCamelCase(data.scenario.current_impact)]()} + {m[toCamelCase(data.scenario.current_impact)]() ?? data.scenario.current_impact} {:else} {data.scenario.current_impact} {/if} @@ -148,8 +148,8 @@ class="text-sm text-center font-semibold p-2 rounded-md w-20" style="background-color: {data.scenario.current_level.hexcolor}" > - {#if localItems()[toCamelCase(data.scenario.current_level.name)]} - {localItems()[toCamelCase(data.scenario.current_level.name)]} + {#if m[toCamelCase(data.scenario.current_level.name)]()} + {m[toCamelCase(data.scenario.current_level.name)]() ?? data.scenario.current_level.name} {:else} {data.scenario.current_level.name} {/if} @@ -170,8 +170,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)]} - {localItems()[toCamelCase(data.scenario.residual_proba)]} + {#if m[toCamelCase(data.scenario.residual_proba)]()} + {m[toCamelCase(data.scenario.residual_proba)]() ?? data.scenario.residual_proba} {:else} {data.scenario.residual_proba} {/if} @@ -184,8 +184,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)]} - {localItems()[toCamelCase(data.scenario.residual_impact)]} + {#if m[toCamelCase(data.scenario.residual_impact)]()} + {m[toCamelCase(data.scenario.residual_impact)]() ?? data.scenario.residual_impact} {:else} {data.scenario.residual_impact} {/if} @@ -198,8 +198,8 @@ class="text-sm text-center font-semibold p-2 rounded-md w-20" style="background-color: {data.scenario.residual_level.hexcolor}" > - {#if localItems()[toCamelCase(data.scenario.residual_level.name)]} - {localItems()[toCamelCase(data.scenario.residual_level.name)]} + {#if m[toCamelCase(data.scenario.residual_level.name)]()} + {m[toCamelCase(data.scenario.residual_level.name)]() ?? data.scenario.residual_level.name} {:else} {data.scenario.residual_level.name} {/if} @@ -215,10 +215,10 @@ {data.scenario.strength_of_knowledge.symbol} {/if} - {#if localItems()[toCamelCase(data.scenario.strength_of_knowledge.name)]} - {localItems()[toCamelCase(data.scenario.strength_of_knowledge.name)]} + {#if m[toCamelCase(data.scenario.strength_of_knowledge.name)]()} + {m[toCamelCase(data.scenario.strength_of_knowledge.name)]() ?? data.scenario.strength_of_knowledge.name} {:else} - {localItems()['undefined']} + {m['undefined']()} {/if}

          diff --git a/frontend/src/routes/(app)/risk-scenarios/[id=uuid]/edit/RiskLevel.svelte b/frontend/src/routes/(app)/risk-scenarios/[id=uuid]/edit/RiskLevel.svelte index ad01bf961..1832c076d 100644 --- a/frontend/src/routes/(app)/risk-scenarios/[id=uuid]/edit/RiskLevel.svelte +++ b/frontend/src/routes/(app)/risk-scenarios/[id=uuid]/edit/RiskLevel.svelte @@ -54,8 +54,8 @@ class="flex font-medium w-32 justify-center p-2 rounded-token" style="background-color: {riskLevel.hexcolor}" > - {#if localItems()[toCamelCase(riskLevel.name)]} - {localItems()[toCamelCase(riskLevel.name)]} + {#if m[toCamelCase(riskLevel.name)]()} + {m[toCamelCase(riskLevel.name)]() ?? riskLevel.name} {:else} {riskLevel.name} {/if} diff --git a/frontend/src/routes/(app)/scoring-assistant/selector.svelte b/frontend/src/routes/(app)/scoring-assistant/selector.svelte index f6d48c040..93b5fa55b 100644 --- a/frontend/src/routes/(app)/scoring-assistant/selector.svelte +++ b/frontend/src/routes/(app)/scoring-assistant/selector.svelte @@ -14,11 +14,11 @@ $: dispatch('change', value); -
          {localItems()[text]}
          +
          {m[text]()}
          diff --git a/frontend/src/routes/(app)/users/[id=uuid]/edit/+page.server.ts b/frontend/src/routes/(app)/users/[id=uuid]/edit/+page.server.ts index 96caa63fc..64664f0d4 100644 --- a/frontend/src/routes/(app)/users/[id=uuid]/edit/+page.server.ts +++ b/frontend/src/routes/(app)/users/[id=uuid]/edit/+page.server.ts @@ -62,7 +62,7 @@ export const actions: Actions = { const response = await res.json(); console.error('server response:', response); if (response.error) { - setFlash({ type: 'error', message: localItems()[response.error] }, event); + setFlash({ type: 'error', message: m[response.error]() }, event); return fail(403, { form: form }); } if (response.non_field_errors) { diff --git a/frontend/src/routes/(app)/x-rays/+page.svelte b/frontend/src/routes/(app)/x-rays/+page.svelte index 12f5a5d98..9474ba1e4 100644 --- a/frontend/src/routes/(app)/x-rays/+page.svelte +++ b/frontend/src/routes/(app)/x-rays/+page.svelte @@ -115,7 +115,7 @@ {#if error.object.name}{error.object.name}:{/if} - {localItems()[error.msgid]} + {m[error.msgid]()} {/each}
        @@ -139,7 +139,7 @@ {#if warning.object.name} {warning.object.name}: {/if} - {localItems()[warning.msgid]} + {m[warning.msgid]()}
        • {/each}
      @@ -163,7 +163,7 @@ {#if info.object.name}{info.object.name}:{/if} - {localItems()[info.msgid]} + {m[info.msgid]()} {/each}
    @@ -205,7 +205,7 @@ {#if error.object.name}{error.object.name}:{/if} - {localItems()[error.msgid]} + {m[error.msgid]()}
    • {/each}
@@ -229,7 +229,7 @@ {#if warning.object.name}{warning.object.name}:{/if} - {localItems()[warning.msgid]} + {m[warning.msgid]()} {/each} @@ -253,7 +253,7 @@ {#if info.object.name}{info.object.name}:{/if} - {localItems()[info.msgid]} + {m[info.msgid]()} {/each}