From d6c47e73ef48eab77112e5ded66951ca2c8a6599 Mon Sep 17 00:00:00 2001
From: Justin Tennant <me@justintennant.me>
Date: Tue, 13 Sep 2022 20:51:38 -0700
Subject: [PATCH] Revert "base template: Fix multilingual extra //'s"

Unfortunately this fix causes a new bug with sites hosted within a
directory of a domain (eg: justintennant.me/papaya) where the menu items
would be missing a "/" inbetween the base url and the menu item slug
(eg: justintennant.me/papayablog instead of
justintennant.me/papaya/blog).

I'm not sure what a clean solution is yet to both these problems so I'm
reverting for now.

This reverts commit 9da007ea5f1b4187ee4ee0b8736191a5b3deeffa.
---
 templates/base.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/base.html b/templates/base.html
index 1f75140..ada982d 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -40,7 +40,7 @@ <h1 class="site-header">
             <ul>
             {% block nav_bar %}
             {% for subsec in config.extra.menu_items %}
-                {% set link_url = subsec.url | replace(from="$BASE_URL", to=config.base_url) | replace(from="$LANG_BASE_URL/", to=base_url) %}
+                {% set link_url = subsec.url | replace(from="$BASE_URL", to=config.base_url) | replace(from="$LANG_BASE_URL", to=base_url) %}
                 <li><a {% if current_url and current_url is starting_with(link_url) %}class="active"{% endif %} href="{{ link_url }}">{{ trans(key=subsec.name, lang=lang) }}</a></li>
             {% endfor %}
             {% endblock nav_bar %}