Limit non-English locales

client/src/constants.ts

@@ -25,37 +25,15 @@ export const AUTOCOMPLETE_SEARCH_WIDGET = JSON.parse(
 // We could encode the list in the SSR rendering but that means the client side
 // code needs to depend on having access to the `window` global first.
 export const VALID_LOCALES = new Set([
-  "ar",
-  "bg",
-  "bn",
-  "ca",
   "de",
-  "el",
   "en-US",
   "es",
-  "fa",
-  "fi",
   "fr",
-  "he",
-  "hi-IN",
-  "hu",
-  "id",
-  "it",
   "ja",
-  "kab",
   "ko",
-  "ms",
-  "my",
-  "nl",
   "pl",
   "pt-BR",
-  "pt-PT",
   "ru",
-  "sv-SE",
-  "th",
-  "tr",
-  "uk",
-  "vi",
   "zh-CN",
   "zh-TW",
 ]);

deployer/aws-lambda/content-origin-request/index.js

@@ -105,12 +105,14 @@ exports.handler = async (event) => {
     return redirect(`/${request.uri.replace(/^\/+/g, "")}`);
   }
 
-  const { url, status } = resolveFundamental(request.uri);
+  let { url, status } = resolveFundamental(request.uri);
   if (url) {
-    // TODO: Do we want to add the query string to the redirect?
-    //       If we decide we do, then we probably need to change
-    //       the caching policy on the "*/docs/* behavior" to
-    //       cache based on the query strings as well.
+    // NOTE: The query string is not forwarded for document requests,
+    //       as directed by their origin request policy, so it's safe to
+    //       assume "request.querystring" is empty for document requests.
+    if (request.querystring) {
+      url += (url.includes("?") ? "&" : "?") + request.querystring;
+    }
     return redirect(url, {
       status,
       cacheControlSeconds: THIRTY_DAYS,
@@ -127,6 +129,7 @@ exports.handler = async (event) => {
     const path = request.uri.endsWith("/")
       ? request.uri.slice(0, -1)
       : request.uri;
+    // Note that "getLocale" only returns valid locales, never a retired locale.
     const locale = getLocale(request);
     // The only time we actually want a trailing slash is when the URL is just
     // the locale. E.g. `/en-US/` (not `/en-US`)

libs/constants/index.js

@@ -1,38 +1,43 @@
 const VALID_LOCALES = new Map(
+  [
+    "de",
+    "en-US",
+    "es",
+    "fr",
+    "ja",
+    "ko",
+    "pl",
+    "pt-BR",
+    "ru",
+    "zh-CN",
+    "zh-TW",
+  ].map((x) => [x.toLowerCase(), x])
+);
+
+const RETIRED_LOCALES = new Map(
   [
     "ar",
     "bg",
     "bn",
     "ca",
-    "de",
     "el",
-    "en-US",
-    "es",
     "fa",
     "fi",
-    "fr",
     "he",
     "hi-IN",
     "hu",
     "id",
     "it",
-    "ja",
     "kab",
-    "ko",
     "ms",
     "my",
     "nl",
-    "pl",
-    "pt-BR",
     "pt-PT",
-    "ru",
     "sv-SE",
     "th",
     "tr",
     "uk",
     "vi",
-    "zh-CN",
-    "zh-TW",
   ].map((x) => [x.toLowerCase(), x])
 );
 
@@ -41,7 +46,7 @@ const DEFAULT_LOCALE = "en-US";
 const LOCALE_ALIASES = new Map([
   // Case is not important on either the keys or the values.
   ["en", "en-us"],
-  ["pt", "pt-PT"], // Note! Portugal Portugese is the default
+  ["pt", "pt-br"],
   ["cn", "zh-cn"],
   ["zh", "zh-cn"],
   ["zh-hans", "zh-cn"],
@@ -64,6 +69,7 @@ const ACTIVE_LOCALES = new Set([
 module.exports = {
   ACTIVE_LOCALES,
   VALID_LOCALES,
+  RETIRED_LOCALES,
   DEFAULT_LOCALE,
   LOCALE_ALIASES,
   PREFERRED_LOCALE_COOKIE_NAME,

libs/fundamental-redirects/index.js

@@ -1,4 +1,8 @@
-const { VALID_LOCALES, LOCALE_ALIASES } = require("../constants");
+const {
+  VALID_LOCALES,
+  LOCALE_ALIASES,
+  RETIRED_LOCALES,
+} = require("../constants");
 
 const startRe = /^\^?\/?/;
 const startTemplate = /^\//;
@@ -65,12 +69,12 @@ for (const locale of VALID_LOCALES.keys()) {
 }
 
 for (const [alias, correct] of LOCALE_ALIASES) {
-  // E.g. things like `en` -> `en-us` or `pt` -> `pt-pt`
+  // E.g. things like `en` -> `en-us` or `pt` -> `pt-br`
   fixableLocales.set(alias, correct);
 }
 
-// All things like `/en_Us/docs/...` -> `/en-US/docs/...`
 const LOCALE_PATTERNS = [
+  // All things like `/en_Us/docs/...` -> `/en-US/docs/...`
   redirect(
     new RegExp(
       `^(?<locale>${Array.from(fixableLocales.keys()).join(
@@ -92,6 +96,21 @@ const LOCALE_PATTERNS = [
     },
     { permanent: true }
   ),
+  // Retired locales
+  redirect(
+    new RegExp(
+      `^(?<locale>${Array.from(RETIRED_LOCALES.keys()).join(
+        "|"
+      )})(/(?<suffix>.*)|$)`,
+      "i"
+    ),
+    ({ locale, suffix }) => {
+      const join = suffix && suffix.includes("?") ? "&" : "?";
+      return `/en-US/${
+        (suffix || "") + join
+      }retiredLocale=${RETIRED_LOCALES.get(locale.toLowerCase())}`;
+    }
+  ),
 ];
 
 // Redirects/rewrites/aliases migrated from SCL3 httpd config

testing/integration/headless/map_301.py

@@ -1069,8 +1069,8 @@
     url_test("/EN-US/?next=FOO", "/en-US/?next=FOO", status_code=302),
     url_test("/eN-us/docs/Web", "/en-US/docs/Web", status_code=302),
     url_test("/eN-us/docs/Web/", "/en-US/docs/Web", status_code=302),
-    url_test("/eN-us/docs/Web?next=FOO", "/en-US/docs/Web?next=FOO", status_code=302),
-    url_test("/eN-us/docs/Web/?next=FOO", "/en-US/docs/Web?next=FOO", status_code=302),
+    url_test("/eN-us/docs/Web?next=FOO", "/en-US/docs/Web", status_code=302),
+    url_test("/eN-us/docs/Web/?next=FOO", "/en-US/docs/Web", status_code=302),
     url_test("/en-uS/search", "/en-US/search", status_code=302),
     url_test("/en-uS/search/", "/en-US/search", status_code=302),
     url_test("/en-Us/search?q=video", "/en-US/search?q=video", status_code=302),

testing/integration/headless/test_redirects.py

@@ -1,5 +1,6 @@
 import pytest
 
+from . import request
 from utils.urls import assert_valid_url
 
 from .map_301 import (
@@ -116,3 +117,59 @@ def test_firefox_source_docs_redirects(url, base_url):
 def test_misc_redirects(url, base_url):
     url["base_url"] = base_url
     assert_valid_url(**url)
+
+
+@pytest.mark.parametrize(
+    "retired_locale",
+    (
+        "ar",
+        "bg",
+        "bn",
+        "ca",
+        "el",
+        "fa",
+        "fi",
+        "he",
+        "hi-IN",
+        "hu",
+        "id",
+        "it",
+        "kab",
+        "ms",
+        "my",
+        "nl",
+        "pt-PT",
+        "sv-SE",
+        "th",
+        "tr",
+        "uk",
+        "vi",
+    ),
+)
+@pytest.mark.parametrize(
+    "slug",
+    [
+        "",
+        "/",
+        "/docs/Web",
+        "/docs/Web/",
+        "/search",
+        "/search/",
+        "/search?q=video",
+        "/search/?q=video",
+        "/signup",
+        "/settings",
+    ],
+)
+def test_retired_locale_redirects(base_url, slug, retired_locale):
+    """Ensure that requests for retired locales properly redirect."""
+    resp = request("get", f"{base_url}/{retired_locale}{slug}")
+    assert resp.status_code == 302
+    slug_parts = slug.split("?")
+    expected_slug = slug_parts[0].lstrip("/")
+    expected_qs = f"?retiredLocale={retired_locale}"
+    if len(slug_parts) > 1:
+        expected_qs += f"&{slug_parts[1]}"
+    assert (
+        resp.headers["Location"] == f"/en-US/{expected_slug}{expected_qs}"
+    ), f"{resp.headers['Location']} is not /en-US/{expected_slug}{expected_qs}"

testing/tests/developing.test.js

@@ -166,12 +166,12 @@ describe("Testing the Express server", () => {
     const response = await got(serverURL("/"), {
       followRedirect: false,
       headers: {
-        Cookie: "preferredlocale=SV-se",
+        Cookie: "preferredlocale=ja",
         "Accept-language": "fr-CH, fr;q=0.9, en;q=0.8, de;q=0.7, *;q=0.5",
       },
     });
     expect(response.statusCode).toBe(302);
-    expect(response.headers.location).toBe("/sv-SE/");
+    expect(response.headers.location).toBe("/ja/");
   });
 });
 

testing/tests/headless.test.js

@@ -218,10 +218,10 @@ describe("Basic viewing of functional pages", () => {
   });
 
   it("should suggest the en-US equivalent on non-en-US pages not found", async () => {
-    await page.goto(testURL("/sv-SE/docs/Web/foo"));
+    await page.goto(testURL("/ja/docs/Web/foo"));
     await expect(page).toMatch("Page not found");
-    await expect(page).toMatch("/sv-SE/docs/Web/foo could not be found");
-    // Simply by swapping the "sv-SE" for "en-US" it's able to find the index.json
+    await expect(page).toMatch("/ja/docs/Web/foo could not be found");
+    // Simply by swapping the "ja" for "en-US" it's able to find the index.json
     // for that slug and present a link to it.
     await expect(page).toMatch("Good news!");
     await expect(page).toMatchElement("a", {