From 4dbef3fcd7a14437d55c555cf10d50de8e50d7d1 Mon Sep 17 00:00:00 2001 From: ivarlovlie Date: Fri, 9 Dec 2022 11:57:12 +0900 Subject: feat: Move everything out of $lib --- code/app/src/hooks.server.ts | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) (limited to 'code/app/src/hooks.server.ts') diff --git a/code/app/src/hooks.server.ts b/code/app/src/hooks.server.ts index 59acab6..9a83379 100644 --- a/code/app/src/hooks.server.ts +++ b/code/app/src/hooks.server.ts @@ -1,29 +1,29 @@ -import { CookieNames } from "$lib/configuration"; -import { detectLocale, i18n, isLocale, locales } from '$lib/i18n/i18n-util' -import type { Handle, RequestEvent } from '@sveltejs/kit' -import { initAcceptLanguageHeaderDetector } from 'typesafe-i18n/detectors' -import type { Locales } from "$lib/i18n/i18n-types"; -import { loadAllLocales } from "$lib/i18n/i18n-util.sync"; - - -loadAllLocales() -const L = i18n() - -export const handle: Handle = async ({ event, resolve }) => { +import {CookieNames} from "$configuration"; +import {detectLocale, i18n, isLocale, locales} from "$i18n/i18n-util"; +import {log_debug} from "$help/logger"; +import type {Handle, RequestEvent} from "@sveltejs/kit"; +import {initAcceptLanguageHeaderDetector} from "typesafe-i18n/detectors"; +import type {Locales} from "$i18n/i18n-types"; +import {loadAllLocales} from "$i18n/i18n-util.sync"; + +loadAllLocales(); +const L = i18n(); + +export const handle: Handle = async ({event, resolve}) => { const localeCookie = event.cookies.get(CookieNames.locale); const preferredLocale = getPreferredLocale(event); let finalLocale = localeCookie ?? preferredLocale; let forceCookieSet = false; - console.log("Handling locale", { + log_debug("Handling locale", { locales, localeCookie, preferredLocale, - finalLocale + finalLocale, }); if (!isLocale(finalLocale)) { - console.log(finalLocale + " is not a valid locale or it does not exist, switching to default: en"); + log_debug(finalLocale + " is not a valid locale or it does not exist, switching to default: en"); finalLocale = "en"; forceCookieSet = true; } @@ -33,15 +33,15 @@ export const handle: Handle = async ({ event, resolve }) => { event.cookies.set(CookieNames.locale, finalLocale, { sameSite: "strict", path: "/", - httpOnly: false + httpOnly: false, }); } event.locals.locale = finalLocale as Locales; event.locals.LL = L[finalLocale as Locales]; - return resolve(event, { transformPageChunk: ({ html }) => html.replace('%lang%', finalLocale) }); -} + return resolve(event, {transformPageChunk: ({html}) => html.replace("%lang%", finalLocale)}); +}; function getPreferredLocale(event: RequestEvent) { const acceptLanguageDetector = initAcceptLanguageHeaderDetector(event.request); -- cgit v1.3