Merge branch 'MP-1717-fix-ssr-locale' into next

mdn · Nov 7, 2024 · 1743dc0 · 1743dc0
2 parents 919c760 + 12cb8ec
commit 1743dc0
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/ssr/render.tsx b/ssr/render.tsx
@@ -76,6 +76,10 @@ export default function render(
     blogMeta = null,
   }: HydrationData = { url }
 ) {
+  if (!locale) {
+    locale = (doc && doc.locale) || DEFAULT_LOCALE;
+  }
+
   const canonicalURL = `${BASE_URL}${url}`;
 
   let realPageTitle = pageTitle;
@@ -139,10 +143,7 @@ export default function render(
   }
 
   // Open Graph protocol expects `language_TERRITORY` format.
-  const ogLocale = (locale || (doc && doc.locale) || DEFAULT_LOCALE).replace(
-    "-",
-    "_"
-  );
+  const ogLocale = locale.replace("-", "_");
 
   if (locale === "de") {
     // Prevent experimental German locale from being indexed.
@@ -158,7 +159,7 @@ export default function render(
   return (
     "<!doctype html>" +
     renderToString(
-      <html lang={locale || DEFAULT_LOCALE} prefix="og: https://ogp.me/ns#">
+      <html lang={locale} prefix="og: https://ogp.me/ns#">
         <head>
           <meta charSet="utf-8" />
           <meta name="viewport" content="width=device-width,initial-scale=1" />