6 files changed, 33 insertions, 15 deletions
diff --git a/src/lib/locales.ts b/src/lib/locales.ts
new file mode 100644
index 00000000..bca981f8
--- /dev/null
+++ b/src/lib/locales.ts
@@ -0,0 +1,14 @@
+import {
+	de,
+	el,
+	enUS as en,
+	es,
+	faIR as fa,
+	fr,
+	ja,
+	pt,
+	ru,
+	zhCN as zh,
+} from "date-fns/locale";
+
+export default { de, el, en, es, fa, fr, ja, pt, ru, zh };
diff --git a/src/routes/(app)/+layout.svelte b/src/routes/(app)/+layout.svelte
index d8519a1f..6efb3c6c 100644
--- a/src/routes/(app)/+layout.svelte
+++ b/src/routes/(app)/+layout.svelte
@@ -31,7 +31,10 @@
   };
 
   afterNavigate(() => {
+    preloadData(`/${user.username}`);
     preloadData(`/${user.username}/receive`);
+    preloadData("/payments");
+    preloadData("/send");
   });
 
   onMount(async () => {
diff --git a/src/routes/(app)/payment/[id]/+page.svelte b/src/routes/(app)/payment/[id]/+page.svelte
index f7a36717..d49a3cb2 100644
--- a/src/routes/(app)/payment/[id]/+page.svelte
+++ b/src/routes/(app)/payment/[id]/+page.svelte
@@ -17,9 +17,12 @@
   import Icon from "$comp/Icon.svelte";
   import { format } from "date-fns";
   import { PUBLIC_EXPLORER, PUBLIC_LIQUID_EXPLORER } from "$env/static/public";
+  import locales from "$lib/locales";
 
   export let data;
   let { user, payment: p } = data;
+  let locale = locales[user.language];
+
   $: refresh(data);
   let refresh = (d) => {
     ({ user, payment: p } = d);
@@ -180,8 +183,8 @@
   <div>
     <span class="text-lg text-secondary">{$t("payments.date")}</span>
     <div>
-      {format(new Date(created), "h:mmaaa")}
-      {format(new Date(created), "MMM d, yyyy")}
+      {format(new Date(created), "h:mmaaa", { locale })}
+      {format(new Date(created), "MMM d, yyyy", { locale })}
     </div>
   </div>
 
diff --git a/src/routes/(app)/payments/[...page]/+page.svelte b/src/routes/(app)/payments/[...page]/+page.svelte
index e781409f..55e6c914 100644
--- a/src/routes/(app)/payments/[...page]/+page.svelte
+++ b/src/routes/(app)/payments/[...page]/+page.svelte
@@ -9,10 +9,11 @@
   import { page } from "$app/stores";
   import { differenceInDays, getUnixTime, sub } from "date-fns";
   import { goto, invalidate } from "$app/navigation";
-
+  import locales from "$lib/locales";
   export let data;
 
   let { start, end, user, rates, payments } = data;
+  let locale = locales[user.language];
 
   let change = ({ target: { value } }) => goto(value);
   let link = (p) => {
@@ -246,10 +247,10 @@
 
             <div class="text-secondary text-right text-sm my-auto col-span-3">
               <div>
-                {format(new Date(p.created), "h:mm aaa")}
+                {format(new Date(p.created), "h:mm aaa", { locale })}
               </div>
               <div>
-                {format(new Date(p.created), "MMM d, yy")}
+                {format(new Date(p.created), "MMM d, yy", { locale })}
               </div>
             </div>
           </div>
diff --git a/src/routes/(app)/settings/[...tab]/+page.server.ts b/src/routes/(app)/settings/[...tab]/+page.server.ts
index b85b23e8..39533426 100644
--- a/src/routes/(app)/settings/[...tab]/+page.server.ts
+++ b/src/routes/(app)/settings/[...tab]/+page.server.ts
@@ -6,7 +6,6 @@ export async function load({ cookies, params, url }) {
 		redirect(307, `${url.pathname}/account`);
 	params.cookies = cookies.getAll();
 	const subscriptions = await get("/subscriptions", auth(cookies));
-	console.log("subs", subscriptions);
 	return { cookies: cookies.getAll(), subscriptions, tab: params.tab };
 }
 
diff --git a/src/routes/+layout.server.ts b/src/routes/+layout.server.ts
index 605c0134..a18ba506 100644
--- a/src/routes/+layout.server.ts
+++ b/src/routes/+layout.server.ts
@@ -1,15 +1,14 @@
-import { auth, get } from "$lib/utils";
 import {
-	locales,
-	loadTranslations,
-	translations,
 	defaultLocale,
+	loadTranslations,
+	locales,
 } from "$lib/translations/index";
+import { auth, get } from "$lib/utils";
 
-export let load = async ({ cookies, request, url }) => {
-	let { host, pathname } = url;
+export const load = async ({ cookies, request, url }) => {
+	const { host, pathname } = url;
 	let user;
-	let token = cookies.get("token");
+	const token = cookies.get("token");
 	if (token) {
 		try {
 			user = await get("/me", auth(cookies));
@@ -27,7 +26,7 @@ export let load = async ({ cookies, request, url }) => {
 	}
 
 	// Get defined locales
-	let supportedLocales = locales.get().map((l) => l.toLowerCase());
+	const supportedLocales = locales.get().map((l) => l.toLowerCase());
 
 	// Use default locale if current locale is not supported
 	if (!supportedLocales.includes(locale)) {
@@ -41,6 +40,5 @@ export let load = async ({ cookies, request, url }) => {
 		pathname,
 		i18n: { locale, route: pathname },
 		user,
-		translations: translations.get(),
 	};
 };