fix(i18n): 修正 Copilot CR — namespace/key 与字典对齐 + html lang 跟随 locale

longsizhuo · longsizhuo · commit 5a6c9246ca0c · 2026-04-16T18:55:06.000Z
Footer: tagline→brand, github/discord.ariaLabel/srOnly→a11y.github/a11y.discord
Hero: tagline→mission, cta→cta.access
Contribute: 字典补 guideAriaLabel key（zh+en），不依赖 hero namespace
layout: html lang 硬编码改为 locale 驱动，注释更新为 next-intl 描述
diff --git a/app/components/Footer.tsx b/app/components/Footer.tsx
@@ -20,36 +20,36 @@ export async function Footer() {
               textClassName="font-serif font-black text-2xl uppercase italic text-[var(--foreground)]"
             />
             <p className="font-body text-neutral-600 dark:text-neutral-400 mb-8 max-w-md text-justify leading-relaxed">
-              {t("tagline")}
+              {t("brand")}
             </p>
             <div className="flex space-x-2">
               <a
                 href="https://github.com/involutionhell"
                 target="_blank"
                 rel="noopener noreferrer"
-                aria-label={t("github.ariaLabel")}
-                title={t("github.ariaLabel")}
+                aria-label={t("a11y.github")}
+                title={t("a11y.github")}
                 data-umami-event="social_click"
                 data-umami-event-platform="github"
                 data-umami-event-location="footer"
                 className="w-12 h-12 flex items-center justify-center border border-[var(--foreground)] hover:bg-[var(--foreground)] hover:text-[var(--background)] transition-all text-[var(--foreground)]"
               >
                 <Github className="h-5 w-5" />
-                <span className="sr-only">{t("github.srOnly")}</span>
+                <span className="sr-only">{t("a11y.github")}</span>
               </a>
               <a
                 href="https://discord.com/invite/6CGP73ZWbD"
                 target="_blank"
                 rel="noopener noreferrer"
-                aria-label={t("discord.ariaLabel")}
-                title={t("discord.ariaLabel")}
+                aria-label={t("a11y.discord")}
+                title={t("a11y.discord")}
                 data-umami-event="social_click"
                 data-umami-event-platform="discord"
                 data-umami-event-location="footer"
                 className="w-12 h-12 flex items-center justify-center border border-[var(--foreground)] hover:bg-[var(--foreground)] hover:text-[var(--background)] transition-all text-[var(--foreground)]"
               >
                 <MessageCircle className="h-5 w-5" />
-                <span className="sr-only">{t("discord.srOnly")}</span>
+                <span className="sr-only">{t("a11y.discord")}</span>
               </a>
             </div>
           </div>
diff --git a/app/components/Hero.tsx b/app/components/Hero.tsx
@@ -57,7 +57,7 @@ export async function Hero() {
 
             <div className="max-w-2xl">
               <p className="text-xl md:text-2xl font-body leading-relaxed text-justify drop-cap text-[var(--foreground)]">
-                {t("tagline")}
+                {t("mission")}
               </p>
 
               <div className="mt-12">
@@ -94,7 +94,7 @@ export async function Hero() {
                 data-umami-event-label="Access Articles"
               >
                 <button className="w-full py-3 border border-[var(--background)] font-sans text-xs uppercase tracking-widest hover:bg-[var(--background)] hover:text-[var(--foreground)] transition-all cursor-pointer">
-                  {t("cta")}
+                  {t("cta.access")}
                 </button>
               </Link>
             </div>
diff --git a/app/layout.tsx b/app/layout.tsx
@@ -135,8 +135,9 @@ export default async function RootLayout({
   const locale = cookieStore.get("locale")?.value === "en" ? "en" : "zh";
   const searchApi = `/search.${locale}.json`;
   const messages = await getMessages();
+  const htmlLang = locale === "en" ? "en" : "zh-CN";
   return (
-    <html lang="zh-CN" suppressHydrationWarning>
+    <html lang={htmlLang} suppressHydrationWarning>
       <head>
         <link rel="preconnect" href="https://fonts.googleapis.com" />
         <link
@@ -213,8 +214,8 @@ export default async function RootLayout({
       >
         <div className="site-bg site-bg--stars" aria-hidden />
         {/*
-          LocaleProvider 把服务端读出的 locale 注入客户端 Context，
-          客户端组件通过 useT() 拿到翻译函数，保持 SSR/CSR 一致，
+          NextIntlClientProvider 把服务端选定的 locale 和完整 messages 传给客户端，
+          客户端组件通过 useTranslations('ns') 拿到翻译函数，保持 SSR/CSR 一致，
           不在客户端重新读 cookie 避免水合抖动。
         */}
         <NextIntlClientProvider locale={locale} messages={messages}>
diff --git a/messages/en.json b/messages/en.json
@@ -155,7 +155,8 @@
       "pathPreview": "Path preview: ",
       "pathEmpty": "(none selected)",
       "submit": "Continue on GitHub"
-    }
+    },
+    "guideAriaLabel": "Contribution Guide"
   },
   "search": {
     "placeholder": "Search docs...",
diff --git a/messages/zh.json b/messages/zh.json
@@ -155,7 +155,8 @@
       "pathPreview": "路径预览：",
       "pathEmpty": "(未选择)",
       "submit": "继续在 GitHub 新建页面"
-    }
+    },
+    "guideAriaLabel": "查看投稿指南"
   },
   "search": {
     "placeholder": "搜索文档...",
