From 310c90d5731d20d1f180d78193e842edd12952b4 Mon Sep 17 00:00:00 2001
From: hailin <hailin@gdzx.xyz>
Date: Tue, 22 Apr 2025 13:43:10 +0800
Subject: [PATCH] .

---
 app/[locale]/login/page.tsx | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/app/[locale]/login/page.tsx b/app/[locale]/login/page.tsx
index b7a04e5..33dbe26 100644
--- a/app/[locale]/login/page.tsx
+++ b/app/[locale]/login/page.tsx
@@ -25,15 +25,8 @@ export default async function Login({
 }) {
   const cookieStore = cookies()
 
-  // 优先从 cookie 获取 locale，否则使用 URL 参数中的 locale
-  //const localeString = cookieStore.get('locale')?.value || locale;
-
   const localeString = locale;
-
   const { t, resources } = await initTranslations(localeString, ['translation']);
-  // 打印翻译内容确认是否正常加载
-  // console.log("...............localeString: ", {localeString});
-  // console.log("Translation for login.email: ", t("login.email"));
 
   const supabase = createServerClient<Database>(
     process.env.NEXT_PUBLIC_SUPABASE_URL!,
@@ -93,9 +86,9 @@ export default async function Login({
       .single()
 
     if (!homeWorkspace) {
-      const fallbackMessage = String(t("login.unexpectedError"))
+      //const fallbackMessage = String(t("login.unexpectedError"))
       throw new Error(
-        homeWorkspaceError?.message || fallbackMessage
+        homeWorkspaceError?.message || "An unexpected error occurred"
       )
     }
 
@@ -136,7 +129,7 @@ export default async function Login({
       const domainMatch = emailDomainWhitelist?.includes(email.split("@")[1])
       const emailMatch = emailWhitelist?.includes(email)
       if (!domainMatch && !emailMatch) {
-        const errorMessage = String(t("login.signupNotAllowed", { email }))  // ← 这是字符串
+        //const errorMessage = String(t("login.signupNotAllowed", { email }))  // ← 这是字符串
         console.log(`[login page] SignUp======>Redirecting to workspace:, ${errorMessage}`)
         return redirect(
           `/${localeString}/login?message=Email ${email} is not allowed to sign up.`
@@ -185,8 +178,9 @@ export default async function Login({
       return redirect(`/${localeString}/login?message=${error.message}`)
     }
 
-    const emailtoResetMessage = String(t("login.checkEmailToReset"))  // ← 这是字符串
-    return redirect(`/${localeString}/login?message=${emailtoResetMessage}`)
+   // const emailtoResetMessage = String(t("login.checkEmailToReset"))  // ← 这是字符串
+    // return redirect(`/${localeString}/login?message=${emailtoResetMessage}`)
+    return redirect(`/${localeString}/login?message=Check email to reset password`)
   }