From 0eabc48c8c934272052187dcd9d32ba998aa07d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Rialland?= <wiinxt@gmail.com>
Date: Wed, 15 Mar 2023 12:42:15 +0100
Subject: [PATCH] Remove dynamic translation in Meta component

---
 site/scripts/i18n/parser.config.js            |  2 ++
 site/source/components/PageData.tsx           | 20 +++++++++--
 site/source/components/utils/Meta.tsx         | 36 +++++--------------
 site/source/pages/Accessibilité.tsx           |  1 -
 site/source/pages/Documentation.tsx           |  1 -
 site/source/pages/Plan.tsx                    |  1 -
 site/source/pages/_landing/Landing.tsx        |  1 -
 .../choix-statut-juridique/index.tsx          |  1 -
 site/source/pages/budget/index.tsx            |  1 -
 site/source/pages/integration/API.tsx         |  1 -
 site/source/pages/integration/Iframe.tsx      |  1 -
 site/source/pages/integration/Library.tsx     |  1 -
 site/source/pages/integration/Options.tsx     |  1 -
 site/source/pages/integration/Spreadsheet.tsx |  1 -
 site/source/pages/nouveautés/index.tsx        |  1 -
 .../pages/simulateurs-et-assistants/index.tsx |  1 -
 site/source/pages/statistiques/LazyStats.tsx  |  1 -
 17 files changed, 28 insertions(+), 44 deletions(-)

diff --git a/site/scripts/i18n/parser.config.js b/site/scripts/i18n/parser.config.js
index 8fdcbc410..1368defe9 100644
--- a/site/scripts/i18n/parser.config.js
+++ b/site/scripts/i18n/parser.config.js
@@ -98,4 +98,6 @@ export default {
 
 	verbose: false,
 	// Display info about the parsing including some stats
+
+	failOnWarnings: true,
 }
diff --git a/site/source/components/PageData.tsx b/site/source/components/PageData.tsx
index 9d4aaed98..838e4566a 100644
--- a/site/source/components/PageData.tsx
+++ b/site/source/components/PageData.tsx
@@ -10,10 +10,14 @@ import { Emoji } from '@/design-system/emoji'
 import { Spacing } from '@/design-system/layout'
 import { H1 } from '@/design-system/typography/heading'
 import { Intro } from '@/design-system/typography/paragraphs'
-import { useCurrentSimulatorData } from '@/hooks/useCurrentSimulatorData'
+import {
+	MergedSimulatorDataValues,
+	useCurrentSimulatorData,
+} from '@/hooks/useCurrentSimulatorData'
 import { useIsEmbedded } from '@/hooks/useIsEmbedded'
 import useSimulationConfig from '@/hooks/useSimulationConfig'
 import { situationSelector } from '@/store/selectors/simulationSelectors'
+import { Merge, ToOptional } from '@/types/utils'
 
 import { NextSteps } from '../pages/simulateurs/NextSteps'
 import { TrackChapter } from './ATInternetTracking'
@@ -57,9 +61,21 @@ export default function PageData() {
 		...(typeof tracking === 'string' ? { chapter2: tracking } : tracking),
 	} as ComponentPropsWithoutRef<typeof TrackChapter>
 
+	const { ogTitle, ogDescription, ogImage } = meta as Merge<
+		MergedSimulatorDataValues['meta']
+	>
+
 	return (
 		<TrackChapter {...trackInfo}>
-			{meta && <Meta page={`simulateur.${title ?? ''}`} {...meta} />}
+			{meta && (
+				<Meta
+					title={meta.title}
+					description={meta.description}
+					ogTitle={ogTitle}
+					ogDescription={ogDescription}
+					ogImage={ogImage}
+				/>
+			)}
 
 			{beta && <BetaBanner />}
 			{title && !inIframe && (
diff --git a/site/source/components/utils/Meta.tsx b/site/source/components/utils/Meta.tsx
index ecae9fb14..ff71d9e5b 100644
--- a/site/source/components/utils/Meta.tsx
+++ b/site/source/components/utils/Meta.tsx
@@ -1,9 +1,6 @@
-import { useTranslation } from 'react-i18next'
-
 import DefaultHelmet from './DefaultHelmet'
 
 type PropType = {
-	page: string
 	title: string
 	description: string
 	ogDescription?: string
@@ -12,44 +9,27 @@ type PropType = {
 }
 
 export default function Meta({
-	page,
 	title,
 	description,
 	ogDescription,
 	ogTitle,
 	ogImage,
 }: PropType) {
-	const { t } = useTranslation()
-
-	// TODO: refacto des traductions en évitant qu'elles soit dynamique
-	const meta = {
-		title,
-		description: t(`${page}.description`, description) || description,
-		ogDescription: ogDescription
-			? t(`${page}.ogDescription`, ogDescription) || ogDescription
-			: description,
-		ogTitle: ogTitle ? t(`${page}.ogTitle`, ogTitle) || ogTitle : title,
-		ogImage: ogImage ? t(`${page}.ogImage`, ogImage) || ogImage : null,
-	}
-
 	return (
 		<DefaultHelmet>
-			<title>{meta.title}</title>
-			<meta name="description" content={meta.description} />
+			<title>{title}</title>
+			<meta name="description" content={description} />
 			<meta property="og:type" content="website" />
-			<meta property="og:title" content={meta.ogTitle ?? meta.title} />
-			<meta
-				property="og:description"
-				content={meta.ogDescription ?? meta.description}
-			/>
-			{meta.ogImage && (
+			<meta property="og:title" content={ogTitle || title} />
+			<meta property="og:description" content={ogDescription || description} />
+			{ogImage && (
 				<meta
 					property="og:image"
 					content={
-						meta.ogImage.startsWith('http')
-							? meta.ogImage
+						ogImage.startsWith('http')
+							? ogImage
 							: (typeof window !== 'undefined' ? window.location.host : '') +
-							  meta.ogImage
+							  ogImage
 					}
 				/>
 			)}
diff --git a/site/source/pages/Accessibilité.tsx b/site/source/pages/Accessibilité.tsx
index 11d2fe671..5be1c9424 100644
--- a/site/source/pages/Accessibilité.tsx
+++ b/site/source/pages/Accessibilité.tsx
@@ -15,7 +15,6 @@ export default function Accessibilité() {
 		<Trans i18nKey="pages.accessibilité">
 			<H1>Accessibilité</H1>
 			<Meta
-				page="accessibilité"
 				title={t('accessibility.title', 'Accessibilité')}
 				description={t(
 					'accessibility.description',
diff --git a/site/source/pages/Documentation.tsx b/site/source/pages/Documentation.tsx
index 6cd0a9ee7..f716ea241 100644
--- a/site/source/pages/Documentation.tsx
+++ b/site/source/pages/Documentation.tsx
@@ -165,7 +165,6 @@ function DocumentationLanding() {
 		<>
 			<TrackPage chapter1="documentation" name="accueil" />
 			<Meta
-				page="documentation"
 				title={t('documentation.title', 'Documentation')}
 				description={t(
 					'documentation.description',
diff --git a/site/source/pages/Plan.tsx b/site/source/pages/Plan.tsx
index 92f34f835..9e8495469 100644
--- a/site/source/pages/Plan.tsx
+++ b/site/source/pages/Plan.tsx
@@ -21,7 +21,6 @@ export default function Plan() {
 				<Trans i18nKey={'sitemap.title'}>Plan du site</Trans>
 			</H1>
 			<Meta
-				page="plan-du-site"
 				title={t('sitemap.title', 'Plan du site')}
 				description={t(
 					'sitemap.description',
diff --git a/site/source/pages/_landing/Landing.tsx b/site/source/pages/_landing/Landing.tsx
index af83eac93..39a054bef 100644
--- a/site/source/pages/_landing/Landing.tsx
+++ b/site/source/pages/_landing/Landing.tsx
@@ -31,7 +31,6 @@ export default function Landing() {
 		<>
 			<TrackPage chapter1="informations" name="accueil" />
 			<Meta
-				page="landing"
 				title=""
 				description={t(
 					'landing.description',
diff --git a/site/source/pages/assistants/choix-du-statut/choix-statut-juridique/index.tsx b/site/source/pages/assistants/choix-du-statut/choix-statut-juridique/index.tsx
index 776e2a255..2c7f595f5 100644
--- a/site/source/pages/assistants/choix-du-statut/choix-statut-juridique/index.tsx
+++ b/site/source/pages/assistants/choix-du-statut/choix-statut-juridique/index.tsx
@@ -32,7 +32,6 @@ export default function ChoixStatutJuridique() {
 		<FromBottom>
 			<TrackPage name="accueil" />
 			<Meta
-				page="créer"
 				title={t('créer.titre', 'Créer une entreprise')}
 				description={t('créer.description', 'Créer une entreprise')}
 				ogImage={créerSvg}
diff --git a/site/source/pages/budget/index.tsx b/site/source/pages/budget/index.tsx
index f2deef521..4b78b7173 100644
--- a/site/source/pages/budget/index.tsx
+++ b/site/source/pages/budget/index.tsx
@@ -63,7 +63,6 @@ export default function Budget() {
 		<>
 			<TrackPage chapter1="informations" name="budget" />
 			<Meta
-				page="budget"
 				title={t('budget.title', 'Budget')}
 				description={t('budget.description', 'Le budget de mon-entreprise')}
 			/>
diff --git a/site/source/pages/integration/API.tsx b/site/source/pages/integration/API.tsx
index b7890d070..d36104903 100644
--- a/site/source/pages/integration/API.tsx
+++ b/site/source/pages/integration/API.tsx
@@ -21,7 +21,6 @@ export default function API() {
 		<div css="iframe{margin-top: 1em; margin-bottom: 1em}">
 			<ScrollToTop />
 			<Meta
-				page="api"
 				title={t('api.title', 'Utiliser notre API REST')}
 				description={t('api.description', 'Outils pour les développeurs')}
 			/>
diff --git a/site/source/pages/integration/Iframe.tsx b/site/source/pages/integration/Iframe.tsx
index 1d44bd859..8fb093495 100644
--- a/site/source/pages/integration/Iframe.tsx
+++ b/site/source/pages/integration/Iframe.tsx
@@ -100,7 +100,6 @@ function IntegrationCustomizer() {
 				<Trans>Personnalisez l'intégration</Trans>
 			</H2>
 			<Meta
-				page="iframe"
 				title={t('iframe.title', 'Intégrer un simulateur')}
 				description={t('iframe.description', 'Outils pour les développeurs')}
 			/>
diff --git a/site/source/pages/integration/Library.tsx b/site/source/pages/integration/Library.tsx
index 159f12473..00123d5f5 100644
--- a/site/source/pages/integration/Library.tsx
+++ b/site/source/pages/integration/Library.tsx
@@ -21,7 +21,6 @@ export default function Library() {
 	return (
 		<div css="iframe{margin-top: 1em; margin-bottom: 1em}">
 			<Meta
-				page="library"
 				title={t('library.title', 'Librairie de calcul')}
 				description={t('library.description', 'Outils pour les développeurs')}
 			/>
diff --git a/site/source/pages/integration/Options.tsx b/site/source/pages/integration/Options.tsx
index 81e026819..b71a763f6 100644
--- a/site/source/pages/integration/Options.tsx
+++ b/site/source/pages/integration/Options.tsx
@@ -18,7 +18,6 @@ export default function Options() {
 	return (
 		<>
 			<Meta
-				page="intégration"
 				title={t('intégration.title', 'Intégration')}
 				description={t(
 					'intégration.description',
diff --git a/site/source/pages/integration/Spreadsheet.tsx b/site/source/pages/integration/Spreadsheet.tsx
index 241b8d8b2..357ea33cf 100644
--- a/site/source/pages/integration/Spreadsheet.tsx
+++ b/site/source/pages/integration/Spreadsheet.tsx
@@ -17,7 +17,6 @@ export default function Spreadsheet() {
 		<div css="iframe{margin-top: 1em; margin-bottom: 1em}">
 			<ScrollToTop />
 			<Meta
-				page="spreadsheet"
 				title={t('spreadsheet.title', 'Utiliser avec un tableur')}
 				description={t(
 					'spreadsheet.description',
diff --git a/site/source/pages/nouveautés/index.tsx b/site/source/pages/nouveautés/index.tsx
index d7f9df44a..3505d1776 100644
--- a/site/source/pages/nouveautés/index.tsx
+++ b/site/source/pages/nouveautés/index.tsx
@@ -59,7 +59,6 @@ export default function Nouveautés() {
 		<>
 			<TrackPage chapter1="informations" name="nouveautes" />
 			<Meta
-				page="nouveautés"
 				title={t('news.title', 'Nouveautés')}
 				description={t(
 					'news.description',
diff --git a/site/source/pages/simulateurs-et-assistants/index.tsx b/site/source/pages/simulateurs-et-assistants/index.tsx
index 05f4e69ea..64215f7e8 100644
--- a/site/source/pages/simulateurs-et-assistants/index.tsx
+++ b/site/source/pages/simulateurs-et-assistants/index.tsx
@@ -31,7 +31,6 @@ export default function SimulateursEtAssistants() {
 		<>
 			<TrackPage chapter1="simulateurs" name="accueil" />
 			<Meta
-				page="simulateurs"
 				title={titre}
 				description={t(
 					'pages.simulateurs.accueil.description',
diff --git a/site/source/pages/statistiques/LazyStats.tsx b/site/source/pages/statistiques/LazyStats.tsx
index 0ce9cf315..6fe9a549a 100644
--- a/site/source/pages/statistiques/LazyStats.tsx
+++ b/site/source/pages/statistiques/LazyStats.tsx
@@ -21,7 +21,6 @@ export default function StatsPage() {
 		<>
 			<TrackPage chapter1="informations" name="stats" />
 			<Meta
-				page="stats"
 				title={t('stats.title', 'Statistiques')}
 				description={t(
 					'stats.description',