From 8ad250553cb7f4abfc9b61f3ed74835e0eea942f Mon Sep 17 00:00:00 2001
From: T2hhbmEK <T2hhbmEK@gmail.com>
Date: Sun, 22 Jan 2023 08:57:34 +0800
Subject: [PATCH] match menu url without "/"

---
 layouts/partials/menu.html        | 8 ++++----
 layouts/partials/mobile-menu.html | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/layouts/partials/menu.html b/layouts/partials/menu.html
index 408a47f..75e3a60 100644
--- a/layouts/partials/menu.html
+++ b/layouts/partials/menu.html
@@ -1,10 +1,10 @@
 <nav class="navigation-menu">
   <ul class="navigation-menu__inner menu--desktop">
-    {{ $currURL := .Permalink }}
+    {{ $currURL := absLangURL .Permalink | strings.TrimSuffix "/" }}
     {{ if or $.Site.Params.showMenuItems ( eq .Site.Params.showMenuItems 0 ) }}
       {{ range first $.Site.Params.showMenuItems $.Site.Menus.main }}
         {{ if not .HasChildren }}
-          {{ $isCurrURL := eq (absLangURL $currURL) (absLangURL .URL) }}
+          {{ $isCurrURL := eq $currURL (absLangURL .URL | strings.TrimSuffix "/") }}
           <li {{ if $isCurrURL }} class="navigation-menu__active" {{ end }}>
             <a href="{{ .URL }}">{{ .Name }}</a>
           </li>
@@ -18,7 +18,7 @@
               <ul class="menu__dropdown">
                 {{ range last (sub (len $.Site.Menus.main) $.Site.Params.showMenuItems) $.Site.Menus.main }}
                   {{ if not .HasChildren }}
-                    {{ $isCurrURL := eq (absLangURL $currURL) (absLangURL .URL) }}
+                    {{ $isCurrURL := eq $currURL (absLangURL .URL | strings.TrimSuffix "/") }}
                     <li {{ if $isCurrURL }} class="navigation-menu__active" {{ end }}>
                       <a href="{{ .URL }}">{{ .Name }}</a>
                     </li>
@@ -32,7 +32,7 @@
     {{ else }}
       {{ range $.Site.Menus.main }}
         {{ if not .HasChildren }}
-          {{ $isCurrURL := eq (absLangURL $currURL) (absLangURL .URL) }}
+          {{ $isCurrURL := eq $currURL (absLangURL .URL | strings.TrimSuffix "/") }}
           <li {{ if $isCurrURL }} class="navigation-menu__active" {{ end }}>
             <a href="{{ .URL }}">{{ .Name }}</a>
           </li>
diff --git a/layouts/partials/mobile-menu.html b/layouts/partials/mobile-menu.html
index 712cb51..7839256 100644
--- a/layouts/partials/mobile-menu.html
+++ b/layouts/partials/mobile-menu.html
@@ -2,10 +2,10 @@
   <li class="menu__trigger">Menu&nbsp;▾</li>
   <li>
     <ul class="menu__dropdown">
-      {{ $currURL := .Permalink }}
+      {{ $currURL := absLangURL .Permalink | strings.TrimSuffix "/" }}
       {{ range $.Site.Menus.main }}
         {{ if not .HasChildren }}
-          {{ $isCurrURL := eq (absLangURL $currURL) (absLangURL .URL) }}
+          {{ $isCurrURL := eq $currURL (absLangURL .URL | strings.TrimSuffix "/") }}
           <li {{ if $isCurrURL }} class="menu__active" {{ end }}>
             <a href="{{ .URL }}">{{ .Name }}</a>
           </li>