From a77b4bf481cee57e7a5150c41e3bca703f800475 Mon Sep 17 00:00:00 2001
From: Adrien Hopkins <ahopk127@my.yorku.ca>
Date: Fri, 29 Jul 2022 14:01:21 -0500
Subject: i18n setup uses a function instead of an import

---
 src/lib/i18n.js            | 20 +++++++++++---------
 src/routes/__layout.svelte |  3 ++-
 2 files changed, 13 insertions(+), 10 deletions(-)

(limited to 'src')

diff --git a/src/lib/i18n.js b/src/lib/i18n.js
index 2d44a767..95bf7013 100644
--- a/src/lib/i18n.js
+++ b/src/lib/i18n.js
@@ -1,13 +1,12 @@
 import { register, init, getLocaleFromNavigator } from 'svelte-i18n';
 
-let localeCodes = ['en', 'fr'];
+// list of locales to load
+const localeCodes = ['en', 'fr'];
 
 // load locales
 function addLocale(localeCode) {
   register(localeCode, () => import('../locales/' + localeCode + '.json'));
-  console.log("Loaded locale '" + localeCode + "'");
 }
-localeCodes.forEach(addLocale);
 
 // determine locale
 function pickLocale(navigatorLocale, availableLocales) {
@@ -31,10 +30,13 @@ function pickLocale(navigatorLocale, availableLocales) {
   }
 }
 
-let initialLocale = pickLocale(getLocaleFromNavigator(), localeCodes);
-console.log("Selected locale '" + initialLocale + "'");
+// setup internationalization
+export function setupI18n() {
+  localeCodes.forEach(addLocale);
+  let initialLocale = pickLocale(getLocaleFromNavigator(), localeCodes);
 
-init({
-  fallbackLocale: 'en',
-  initialLocale: initialLocale,
-});
+  init({
+    fallbackLocale: 'en',
+    initialLocale: initialLocale,
+  });
+}
diff --git a/src/routes/__layout.svelte b/src/routes/__layout.svelte
index ed1ad188..76b19234 100644
--- a/src/routes/__layout.svelte
+++ b/src/routes/__layout.svelte
@@ -3,9 +3,10 @@
 	import { onMount } from 'svelte';
 	import { connect } from '$lib/socket';
 
-  import '$lib/i18n';
+  import { setupI18n } from '$lib/i18n';
 
 	onMount(connect);
+  setupI18n();
 </script>
 
 <slot />
-- 
cgit v1.2.3