Fix request locale resolution in site pages
CI / quality (push) Waiting to run

This commit is contained in:
MOH
2026-03-15 08:20:39 +01:00
parent c18128c965
commit 288e4b37d7
10 changed files with 80 additions and 81 deletions
+4 -4
View File
@@ -1,5 +1,6 @@
import type { ReactNode } from "react";
import { unstable_noStore as noStore } from "next/cache";
import { getLocale } from "next-intl/server";
import { redirect } from "next/navigation";
import { SiteAmbientBackdrop } from "@/components/layout/site-ambient-backdrop";
@@ -7,7 +8,7 @@ import { SiteFooter } from "@/components/layout/site-footer";
import { SiteHeader } from "@/components/layout/site-header";
import { isAdminAuthenticated } from "@/lib/admin-auth";
import { getMaintenanceMode, getSiteSettings, getSiteSettingsMediaBindings } from "@/lib/app-config";
import { FALLBACK_LOCALE, getLocalizedPath, resolveLocale } from "@/lib/locale";
import { getLocalizedPath, resolveLocale } from "@/lib/locale";
type SiteLayoutProps = {
children: ReactNode;
@@ -21,14 +22,13 @@ export const revalidate = 0;
export default async function SiteLayout({ children, params }: SiteLayoutProps) {
noStore();
const { locale } = await params;
const localeKey = resolveLocale(locale, FALLBACK_LOCALE);
await params;
const [maintenanceEnabled, mediaBindings, siteSettings] = await Promise.all([
getMaintenanceMode(),
getSiteSettingsMediaBindings(),
getSiteSettings(),
]);
const localeKey = resolveLocale(await getLocale().catch(() => siteSettings.defaultLocale), siteSettings.defaultLocale);
const authenticated = await isAdminAuthenticated();
if (maintenanceEnabled && !authenticated) {