From 587f2cbb8245854fc5a2d5a231cf614b523beaf8 Mon Sep 17 00:00:00 2001
From: "opencode-agent[bot]"
 <219766164+opencode-agent[bot]@users.noreply.github.com>
Date: Wed, 28 Oct 2026 04:36:13 -0500
Subject: [PATCH] fix(stats): show the current language in the footer select
 (#59772)

Co-authored-by: neriousy <34747899+neriousy@users.noreply.github.com>
---
 packages/stats/app/src/routes/stats-shell.tsx | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/packages/stats/app/src/routes/stats-shell.tsx b/packages/stats/app/src/routes/stats-shell.tsx
index 04337bb4dc5..e19fe063d58 100644
--- a/packages/stats/app/src/routes/stats-shell.tsx
+++ b/packages/stats/app/src/routes/stats-shell.tsx
@@ -309,7 +309,6 @@ function FooterLanguageSwitcher() {
     <label data-slot="footer-language">
       <span>{i18n.t("footer.language")}</span>
       <select
-        value={language.locale()}
         aria-label={i18n.t("footer.language")}
         onChange={(event) => {
           const locale = event.currentTarget.value as Locale
@@ -320,7 +319,14 @@ function FooterLanguageSwitcher() {
           if (href !== current) window.location.assign(href)
         }}
       >
-        <For each={language.locales}>{(locale) => <option value={locale}>{language.label(locale)}</option>}</For>
+        {/* Mark the option, not the select: SSR ignores a select value and hydration does not apply it. */}
+        <For each={language.locales}>
+          {(locale) => (
+            <option value={locale} selected={locale === language.locale()}>
+              {language.label(locale)}
+            </option>
+          )}
+        </For>
       </select>
     </label>
   )