From 3cf8e00e7923ae6a98bf068574f8a0f3987cc7ff Mon Sep 17 00:00:00 2001
From: Max Peintner <peintnerm@gmail.com>
Date: Fri, 13 Jun 2025 09:21:41 +0200
Subject: [PATCH] locale context from intl-context

---
 apps/login/src/i18n/request.ts | 1 +
 apps/login/src/lib/zitadel.ts  | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/apps/login/src/i18n/request.ts b/apps/login/src/i18n/request.ts
index 36bf3f011e..edcae463d1 100644
--- a/apps/login/src/i18n/request.ts
+++ b/apps/login/src/i18n/request.ts
@@ -18,6 +18,7 @@ export default getRequestConfig(async () => {
 
   const translations = await getHostedLoginTranslation({
     serviceUrl,
+    locale,
     organization: i18nOrganization,
   });
 
diff --git a/apps/login/src/lib/zitadel.ts b/apps/login/src/lib/zitadel.ts
index f567350053..2308c2aff8 100644
--- a/apps/login/src/lib/zitadel.ts
+++ b/apps/login/src/lib/zitadel.ts
@@ -46,7 +46,6 @@ import {
   VerifyPasskeyRegistrationRequest,
   VerifyU2FRegistrationRequest,
 } from "@zitadel/proto/zitadel/user/v2/user_service_pb";
-import { getLocale } from "next-intl/server";
 import { unstable_cacheLife as cacheLife } from "next/cache";
 import { getUserAgent } from "./fingerprint";
 import { createServiceForHost } from "./service";
@@ -63,11 +62,12 @@ async function cacheWrapper<T>(callback: Promise<T>) {
 export async function getHostedLoginTranslation({
   serviceUrl,
   organization,
+  locale,
 }: {
   serviceUrl: string;
   organization?: string;
+  locale?: string;
 }) {
-  const locale = await getLocale();
   const settingsService: Client<typeof SettingsService> =
     await createServiceForHost(SettingsService, serviceUrl);