From edd416aa8ae429b129039eee4d39b256e0b62c65 Mon Sep 17 00:00:00 2001
From: Jayk <20700514+jayk09@users.noreply.github.com>
Date: Wed, 12 Jul 2023 23:38:24 +0200
Subject: [PATCH] Comment shared server translations

---
 .../component-scoped-csr/src/routes/+layout.js    | 14 ++++++++------
 .../src/routes/+layout.server.js                  | 15 +++++++++++++++
 .../src/routes/+layout.server.js                  |  2 +-
 examples/fallback-locale/src/routes/+layout.js    | 14 ++++++++------
 .../fallback-locale/src/routes/+layout.server.js  | 15 +++++++++++++++
 .../locale-param/src/routes/+layout.server.js     |  2 +-
 examples/multi-page/src/routes/+layout.server.js  |  2 +-
 7 files changed, 49 insertions(+), 15 deletions(-)
 create mode 100644 examples/component-scoped-csr/src/routes/+layout.server.js
 create mode 100644 examples/fallback-locale/src/routes/+layout.server.js

diff --git a/examples/component-scoped-csr/src/routes/+layout.js b/examples/component-scoped-csr/src/routes/+layout.js
index b2db26a..618a6a6 100644
--- a/examples/component-scoped-csr/src/routes/+layout.js
+++ b/examples/component-scoped-csr/src/routes/+layout.js
@@ -1,12 +1,14 @@
-import { loadTranslations } from '$lib/translations';
+import { addTranslations, setLocale, setRoute } from '$lib/translations';
 
 /** @type {import('@sveltejs/kit').Load} */
-export const load = async ({ url }) => {
-  const { pathname } = url;
+export const load = async ({ data }) => {
+  const { i18n, translations } = data;
+  const { locale, route } = i18n;
 
-  const initLocale = 'en'; // get from cookie / user session etc...
+  addTranslations(translations);
 
-  await loadTranslations(initLocale, pathname); // keep this just before the `return`
+  await setRoute(route);
+  await setLocale(locale);
 
-  return {};
+  return i18n;
 };
\ No newline at end of file
diff --git a/examples/component-scoped-csr/src/routes/+layout.server.js b/examples/component-scoped-csr/src/routes/+layout.server.js
new file mode 100644
index 0000000..8b2972d
--- /dev/null
+++ b/examples/component-scoped-csr/src/routes/+layout.server.js
@@ -0,0 +1,15 @@
+import { loadTranslations, translations } from '$lib/translations';
+
+/** @type {import('@sveltejs/kit').ServerLoad} */
+export const load = async ({ url }) => {
+  const { pathname } = url;
+
+  const initLocale = 'en'; // get from cookie / user session etc...
+
+  await loadTranslations(initLocale, pathname); // keep this just before the `return`
+
+  return {
+    i18n: { locale: initLocale, route: pathname },
+    translations: translations.get(), // `translations` on server contain all translations loaded by different clients
+  };
+};
\ No newline at end of file
diff --git a/examples/component-scoped-ssr/src/routes/+layout.server.js b/examples/component-scoped-ssr/src/routes/+layout.server.js
index ae0ce5f..8b2972d 100644
--- a/examples/component-scoped-ssr/src/routes/+layout.server.js
+++ b/examples/component-scoped-ssr/src/routes/+layout.server.js
@@ -10,6 +10,6 @@ export const load = async ({ url }) => {
 
   return {
     i18n: { locale: initLocale, route: pathname },
-    translations: translations.get(),
+    translations: translations.get(), // `translations` on server contain all translations loaded by different clients
   };
 };
\ No newline at end of file
diff --git a/examples/fallback-locale/src/routes/+layout.js b/examples/fallback-locale/src/routes/+layout.js
index 41acb95..618a6a6 100644
--- a/examples/fallback-locale/src/routes/+layout.js
+++ b/examples/fallback-locale/src/routes/+layout.js
@@ -1,12 +1,14 @@
-import { loadTranslations } from '$lib/translations';
+import { addTranslations, setLocale, setRoute } from '$lib/translations';
 
 /** @type {import('@sveltejs/kit').Load} */
-export const load = async ({ url }) => {
-  const { pathname } = url;
+export const load = async ({ data }) => {
+  const { i18n, translations } = data;
+  const { locale, route } = i18n;
 
-  const initLocale = 'cs'; // get from cookie, user session, ...
+  addTranslations(translations);
 
-  await loadTranslations(initLocale, pathname); // keep this just before the `return`
+  await setRoute(route);
+  await setLocale(locale);
 
-  return {};
+  return i18n;
 };
\ No newline at end of file
diff --git a/examples/fallback-locale/src/routes/+layout.server.js b/examples/fallback-locale/src/routes/+layout.server.js
new file mode 100644
index 0000000..8b2972d
--- /dev/null
+++ b/examples/fallback-locale/src/routes/+layout.server.js
@@ -0,0 +1,15 @@
+import { loadTranslations, translations } from '$lib/translations';
+
+/** @type {import('@sveltejs/kit').ServerLoad} */
+export const load = async ({ url }) => {
+  const { pathname } = url;
+
+  const initLocale = 'en'; // get from cookie / user session etc...
+
+  await loadTranslations(initLocale, pathname); // keep this just before the `return`
+
+  return {
+    i18n: { locale: initLocale, route: pathname },
+    translations: translations.get(), // `translations` on server contain all translations loaded by different clients
+  };
+};
\ No newline at end of file
diff --git a/examples/locale-param/src/routes/+layout.server.js b/examples/locale-param/src/routes/+layout.server.js
index 0a647a9..e424928 100644
--- a/examples/locale-param/src/routes/+layout.server.js
+++ b/examples/locale-param/src/routes/+layout.server.js
@@ -12,6 +12,6 @@ export const load = async ({ url, cookies }) => {
 
   return {
     i18n: { locale: initLocale, route: pathname },
-    translations: translations.get(),
+    translations: translations.get(), // `translations` on server contain all translations loaded by different clients
   };
 };
\ No newline at end of file
diff --git a/examples/multi-page/src/routes/+layout.server.js b/examples/multi-page/src/routes/+layout.server.js
index ae0ce5f..8b2972d 100644
--- a/examples/multi-page/src/routes/+layout.server.js
+++ b/examples/multi-page/src/routes/+layout.server.js
@@ -10,6 +10,6 @@ export const load = async ({ url }) => {
 
   return {
     i18n: { locale: initLocale, route: pathname },
-    translations: translations.get(),
+    translations: translations.get(), // `translations` on server contain all translations loaded by different clients
   };
 };
\ No newline at end of file