Split preprocessor logic and more code review changes

Author: goanpeca

.gitignore

@@ -141,12 +141,3 @@ doc/source/savefig/
 # Pyodide/WASM related files #
 ##############################
 /.pyodide-xbuildenv-*
-
-
-# Web & Translations #
-##############################
-web/preview/
-web/pandas-translations-main/
-web/pandas/es/
-web/pandas/pt/
-web/pandas/fr/

web/pandas/_templates/layout.html

@@ -60,7 +60,7 @@
 
                     <div class="collapse navbar-collapse" id="nav-content">   
                         <ul class="navbar-nav ms-auto">
-                            {% for item in navbar[lang] %}
+                            {% for item in navbar_translations[lang] %}
                                 {% if not item.has_subitems %}
                                     <li class="nav-item">
                                         <a class="nav-link" href="{% if not item.target.startswith("http") %}{{ base_url }}{% endif %}{{ item.target }}">{{ item.name }}</a>

web/pandas/config.yml

@@ -8,9 +8,11 @@ main:
   - config.yml
   github_repo_url: pandas-dev/pandas
   context_preprocessors:
-  - pandas_web.Preprocessors.process_translations
   - pandas_web.Preprocessors.current_year
+  - pandas_web.Preprocessors.download_translated_content
+  - pandas_web.Preprocessors.add_navbar_content
   - pandas_web.Preprocessors.navbar_add_info
+  - pandas_web.Preprocessors.navbar_add_translated_info
   - pandas_web.Preprocessors.blog_add_posts
   - pandas_web.Preprocessors.maintainers_add_info
   - pandas_web.Preprocessors.home_add_releases

web/pandas_web.py

@@ -67,7 +67,16 @@ class Preprocessors:
     """
 
     @staticmethod
-    def process_translations(context: dict) -> dict:
+    def current_year(context: dict) -> dict:
+        """
+        Add the current year to the context, so it can be used for the copyright
+        note, or other places where it is needed.
+        """
+        context["current_year"] = datetime.datetime.now().year
+        return context
+
+    @staticmethod
+    def download_translated_content(context: dict) -> dict:
         """
         Download the translations from the GitHub repository and extract them.
         """
@@ -90,12 +99,25 @@ def process_translations(context: dict) -> dict:
         return context
 
     @staticmethod
-    def current_year(context: dict) -> dict:
+    def add_navbar_content(context: dict) -> dict:
         """
-        Add the current year to the context, so it can be used for the copyright
-        note, or other places where it is needed.
+        Add the original and translated navbar content to the context, so it can
+        be used in the templates.
         """
-        context["current_year"] = datetime.datetime.now().year
+        context["navbar"] = {}
+        context["navbar_translations"] = {}
+        for lang in context["translations"]["languages"]:
+            with open(
+                os.path.join(
+                    context["source_path"],
+                    "" if lang == "en" else f"{lang}",
+                    context["main"]["navbar_fname"],
+                ),
+                encoding="utf-8",
+            ) as f:
+                navbar_lang = yaml.safe_load(f)
+            context["navbar_translations"][lang] = navbar_lang["navbar"]
+        context["navbar"] = context["navbar_translations"]["en"]
         return context
 
     @staticmethod
@@ -106,36 +128,37 @@ def navbar_add_info(context: dict) -> dict:
         ``has_subitems`` that tells which one of them every element is. It
         also adds a ``slug`` field to be used as a CSS id.
         """
+        for i, item in enumerate(context["navbar"]):
+            context["navbar"][i] = dict(
+                item,
+                has_subitems=isinstance(item["target"], list),
+                slug=(item["name"].replace(" ", "-").lower()),
+            )
+        return context
+
+    @staticmethod
+    def navbar_add_translated_info(context: dict) -> dict:
+        """
+        Add the translated navbar content to the context, so it can be used in
+        the templates. The translated navbar content is stored in the
+        """
 
-        def update_target(item: dict, url_prefix: str) -> None:
+        def update_target(item: dict, prefix: str) -> None:
             if item.get("translated", True):
-                item["target"] = f"{url_prefix}{item['target']}"
+                item["target"] = f"{prefix}/{item['target']}"
             else:
                 item["target"] = f"../{item['target']}"
 
-        context["navbar"] = {}
-        for lang in context["translations"]["languages"]:
-            prefix = "" if lang == "en" else lang
-            url_prefix = "" if lang == "en" else lang + "/"
-            with open(
-                os.path.join(
-                    context["source_path"], prefix, context["main"]["navbar_fname"]
-                ),
-                encoding="utf-8",
-            ) as f:
-                navbar_lang = yaml.safe_load(f)
-
-            context["navbar"][lang] = navbar_lang["navbar"]
-            for i, item in enumerate(navbar_lang["navbar"]):
+        for lang in list(context["translations"]["languages"].keys())[1:]:
+            for i, item in enumerate(context["navbar_translations"][lang]):
                 has_subitems = isinstance(item["target"], list)
-                if lang != "en":
-                    if has_subitems:
-                        for sub_item in item["target"]:
-                            update_target(sub_item, url_prefix)
-                    else:
-                        update_target(item, url_prefix)
-
-                context["navbar"][lang][i] = dict(
+                if has_subitems:
+                    for sub_item in item["target"]:
+                        update_target(sub_item, lang)
+                else:
+                    update_target(item, lang)
+
+                context["navbar_translations"][lang][i] = dict(
                     item,
                     has_subitems=has_subitems,
                     slug=(item["name"].replace(" ", "-").lower()),