From e800b2ebef976b9894a9c1be656fa30949adc1f8 Mon Sep 17 00:00:00 2001
From: vcoppe <vianney.coppe@gmail.com>
Date: Wed, 14 Aug 2024 09:27:53 +0200
Subject: [PATCH] optional parameter for language, instead of rest parameter

---
 website/src/lib/components/Head.svelte                      | 6 +++---
 website/src/routes/+layout.svelte                           | 2 +-
 .../routes/{[...language] => [[language]]}/+layout.svelte   | 0
 .../src/routes/{[...language] => [[language]]}/+page.svelte | 0
 .../routes/{[...language] => [[language]]}/app/+page.svelte | 0
 .../{[...language] => [[language]]}/embed/+page.svelte      | 0
 .../{[...language] => [[language]]}/help/+layout.svelte     | 0
 .../{[...language] => [[language]]}/help/+page.svelte       | 0
 .../help/[...guide]/+page.svelte                            | 0
 9 files changed, 4 insertions(+), 4 deletions(-)
 rename website/src/routes/{[...language] => [[language]]}/+layout.svelte (100%)
 rename website/src/routes/{[...language] => [[language]]}/+page.svelte (100%)
 rename website/src/routes/{[...language] => [[language]]}/app/+page.svelte (100%)
 rename website/src/routes/{[...language] => [[language]]}/embed/+page.svelte (100%)
 rename website/src/routes/{[...language] => [[language]]}/help/+layout.svelte (100%)
 rename website/src/routes/{[...language] => [[language]]}/help/+page.svelte (100%)
 rename website/src/routes/{[...language] => [[language]]}/help/[...guide]/+page.svelte (100%)

diff --git a/website/src/lib/components/Head.svelte b/website/src/lib/components/Head.svelte
index 4f6e84b9..87f8831c 100644
--- a/website/src/lib/components/Head.svelte
+++ b/website/src/lib/components/Head.svelte
@@ -15,7 +15,7 @@
 				location = location.replace(`[...${param}]`, $page.params[param]);
 			}
 		});
-		title = location.replace('/[...language]', '').split('/')[1] ?? 'home';
+		title = location.replace('/[[language]]', '').split('/')[1] ?? 'home';
 	}
 </script>
 
@@ -58,13 +58,13 @@
 	<link
 		rel="alternate"
 		hreflang="x-default"
-		href="https://gpx.studio{base}{location.replace('/[...language]', '')}"
+		href="https://gpx.studio{base}{location.replace('/[[language]]', '')}"
 	/>
 	{#each Object.keys(languages) as lang}
 		<link
 			rel="alternate"
 			hreflang={lang}
-			href="https://gpx.studio{base}{location.replace('[...language]', lang)}"
+			href="https://gpx.studio{base}{location.replace('[[language]]', lang)}"
 		/>
 	{/each}
 </svelte:head>
diff --git a/website/src/routes/+layout.svelte b/website/src/routes/+layout.svelte
index 973bc96a..71b8c378 100644
--- a/website/src/routes/+layout.svelte
+++ b/website/src/routes/+layout.svelte
@@ -7,7 +7,7 @@
 	import Nav from '$lib/components/Nav.svelte';
 	import Footer from '$lib/components/Footer.svelte';
 
-	const appRoutes = ['/[...language]/app', '/[...language]/embed'];
+	const appRoutes = ['/[[language]]/app', '/[[language]]/embed'];
 
 	$: showNavAndFooter = $page.route.id === null || !appRoutes.includes($page.route.id);
 </script>
diff --git a/website/src/routes/[...language]/+layout.svelte b/website/src/routes/[[language]]/+layout.svelte
similarity index 100%
rename from website/src/routes/[...language]/+layout.svelte
rename to website/src/routes/[[language]]/+layout.svelte
diff --git a/website/src/routes/[...language]/+page.svelte b/website/src/routes/[[language]]/+page.svelte
similarity index 100%
rename from website/src/routes/[...language]/+page.svelte
rename to website/src/routes/[[language]]/+page.svelte
diff --git a/website/src/routes/[...language]/app/+page.svelte b/website/src/routes/[[language]]/app/+page.svelte
similarity index 100%
rename from website/src/routes/[...language]/app/+page.svelte
rename to website/src/routes/[[language]]/app/+page.svelte
diff --git a/website/src/routes/[...language]/embed/+page.svelte b/website/src/routes/[[language]]/embed/+page.svelte
similarity index 100%
rename from website/src/routes/[...language]/embed/+page.svelte
rename to website/src/routes/[[language]]/embed/+page.svelte
diff --git a/website/src/routes/[...language]/help/+layout.svelte b/website/src/routes/[[language]]/help/+layout.svelte
similarity index 100%
rename from website/src/routes/[...language]/help/+layout.svelte
rename to website/src/routes/[[language]]/help/+layout.svelte
diff --git a/website/src/routes/[...language]/help/+page.svelte b/website/src/routes/[[language]]/help/+page.svelte
similarity index 100%
rename from website/src/routes/[...language]/help/+page.svelte
rename to website/src/routes/[[language]]/help/+page.svelte
diff --git a/website/src/routes/[...language]/help/[...guide]/+page.svelte b/website/src/routes/[[language]]/help/[...guide]/+page.svelte
similarity index 100%
rename from website/src/routes/[...language]/help/[...guide]/+page.svelte
rename to website/src/routes/[[language]]/help/[...guide]/+page.svelte