Add missing redirects and remove obsolete code for legacy redirects

Author: Kobzol

src/redirect.rs

@@ -1,5 +1,4 @@
-use crate::i18n::SUPPORTED_LOCALES;
-use crate::render::RenderCtx;
+use crate::render::{RenderCtx, render_redirect};
 
 pub static PAGE_REDIRECTS: &[(&str, &str)] = &[
     // Pre-2018 website pages
@@ -74,13 +73,6 @@ static EXTERNAL_REDIRECTS: &[(&str, &str)] = &[
     ("sponsors", "https://foundation.rust-lang.org/members/"),
 ];
 
-// Translations present on www.rust-lang.org before the 2018 redesign. If an equivalent translation
-// is present in the current codebase it will be migrated automatically.
-static PRE_2018_LOCALES: &[&str] = &[
-    "de-DE", "en-US", "es-ES", "fr-FR", "id-ID", "it-IT", "ja-JP", "ko-KR", "pl-PL", "pt-BR",
-    "ru-RU", "sv-SE", "vi-VN",
-];
-
 pub fn create_redirects(ctx: &RenderCtx) -> anyhow::Result<()> {
     // Static file redirects, no need to support languages
     // We cannot really make non-HTML redirects easily, so we just duplicate the file contents
@@ -89,63 +81,13 @@ pub fn create_redirects(ctx: &RenderCtx) -> anyhow::Result<()> {
         ctx.copy_asset_file(dst, src)?;
     }
 
-    // if let Some((_, dest)) = STATIC_FILES_REDIRECTS.iter().find(|(src, _)| src == &path) {
-    //     return Some(Redirect::permanent(*dest));
-    // }
-    //
-    // let (locale, path) = if let Some((first, rest)) = path.split_once('/') {
-    //     if SUPPORTED_LOCALES.contains(&first) {
-    //         (Locale::Present(first), rest)
-    //     // After the 2018 website redesign some of the locales were removed and some were
-    //     // renamed (removing the country code). This handles both cases, either calculating the
-    //     // renamed locale or marking the locale as "specified but missing", which triggers a
-    //     // temporary redirect instead of a permanent redirect.
-    //     } else if PRE_2018_LOCALES.contains(&first) {
-    //         if let Some(locale) = convert_locale_from_pre_2018(first) {
-    //             (Locale::Present(locale), rest)
-    //         } else {
-    //             (Locale::SpecifiedButMissing, rest)
-    //         }
-    //     } else {
-    //         (Locale::NotSpecified, path.as_str())
-    //     }
-    // } else if PRE_2018_LOCALES.contains(&path.as_str()) {
-    //     // If the whole path is a pre-2018 locale handle it as a localized index page.
-    //     if let Some(locale) = convert_locale_from_pre_2018(&path) {
-    //         (Locale::Present(locale), "")
-    //     } else {
-    //         (Locale::SpecifiedButMissing, "")
-    //     }
-    // } else {
-    //     (Locale::NotSpecified, path.as_str())
-    // };
-    //
-    // if let Some((_, dest)) = EXTERNAL_REDIRECTS.iter().find(|(src, _)| *src == path) {
-    //     Some(Redirect::permanent(*dest))
-    // } else if let Some((_, dest)) = PAGE_REDIRECTS.iter().find(|(src, _)| *src == path) {
-    //     let dest = format!("/{dest}");
-    //     match locale {
-    //         Locale::Present("en-US") | Locale::NotSpecified => Some(Redirect::permanent(dest)),
-    //         Locale::Present(locale) => Some(Redirect::permanent(format!("/{locale}{dest}"))),
-    //         Locale::SpecifiedButMissing => Some(Redirect::temporary(dest)),
-    //     }
-    // } else {
-    //     None
-    // }
-    Ok(())
-}
+    for (src, dst) in EXTERNAL_REDIRECTS {
+        render_redirect(ctx, src, dst)?;
+    }
 
-fn convert_locale_from_pre_2018(pre_2018: &str) -> Option<&str> {
-    if let Some(language) = pre_2018.split('-').next() {
-        if SUPPORTED_LOCALES.contains(&language) {
-            return Some(language);
-        }
+    for (src, dst) in PAGE_REDIRECTS {
+        render_redirect(ctx, src, dst)?;
     }
-    None
-}
 
-enum Locale<'a> {
-    Present(&'a str),
-    SpecifiedButMissing,
-    NotSpecified,
+    Ok(())
 }

src/render.rs

@@ -259,7 +259,7 @@ pub fn render_redirect(render_ctx: &RenderCtx, from: &str, to: &str) -> anyhow::
     }
 
     let url = if !to.starts_with("http") {
-        format!("/{to}")
+        format!("{}/{to}", render_ctx.base_url.get())
     } else {
         to.to_string()
     };