Skip to content

Commit

Permalink
Fixed language "randomly" switching (#728)
Browse files Browse the repository at this point in the history
  • Loading branch information
Fiery-132 authored Feb 17, 2025
1 parent 7a109f3 commit cd490da
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 6 deletions.
9 changes: 7 additions & 2 deletions src/hooks.server.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,11 @@ import { i18n } from "$lib/utils/i18n";
import { createMember } from "$lib/utils/member";
import { redirect } from "$lib/utils/redirect";
import { themes, type Theme } from "$lib/utils/themes";
import { isAvailableLanguageTag, sourceLanguageTag } from "$paraglide/runtime";
import {
isAvailableLanguageTag,
setLanguageTag,
sourceLanguageTag,
} from "$paraglide/runtime";
import Keycloak, { type KeycloakProfile } from "@auth/core/providers/keycloak";
import type { TokenSet } from "@auth/core/types";
import { SvelteKitAuth } from "@auth/sveltekit";
Expand Down Expand Up @@ -103,6 +107,7 @@ const databaseHandle: Handle = async ({ event, resolve }) => {
? event.locals.paraglide?.lang
: sourceLanguageTag;
event.locals.language = lang;
setLanguageTag(lang);
const session = await event.locals.getSession();
const prisma = prismaClient
.$extends(translatedExtension(lang))
Expand Down Expand Up @@ -212,7 +217,7 @@ const themeHandle: Handle = async ({ event, resolve }) => {
// get theme from cookies and send to frontend to show correct icon in theme switch
event.locals.theme = theme as Theme;

return await resolve(event, {
return resolve(event, {
transformPageChunk: ({ html }) => {
return html.replace("%theme%", theme);
},
Expand Down
5 changes: 1 addition & 4 deletions src/routes/+layout.server.ts
Original file line number Diff line number Diff line change
@@ -1,13 +1,10 @@
import { setLanguageTag } from "$paraglide/runtime";
import { loadFlash } from "sveltekit-flash-message/server";
/**
* Load the form flash message.
* Propagates the user and member to the page data.
*/
export const load = loadFlash(async ({ locals }) => {
const { user, member, isApp, appInfo, theme, language } = locals;

setLanguageTag(language);
const { user, member, isApp, appInfo, theme } = locals;

// SUSPECTED SLOW CODE
// if (user?.memberId) {
Expand Down

0 comments on commit cd490da

Please sign in to comment.