fix: make more links respect baseURL config

7 files changed, 7 insertions, 7 deletions

diff --git a/assets/scss/main.scss b/assets/scss/main.scss
index dd1f449..158489a 100644
--- a/assets/scss/main.scss
+++ b/assets/scss/main.scss
@@ -75,7 +75,7 @@
     $enableSmoothScroll: false;
 {{ end }}
 
-$baseRelURL: "{{ strings.TrimSuffix (.Site.BaseURL | relURL) "/" }}";
+$baseRelURL: "{{ "" | relURL | strings.TrimSuffix "/" }}";
 
 
 // Utilities
diff --git a/layouts/404.html b/layouts/404.html
index 6a8a959..60be620 100644
--- a/layouts/404.html
+++ b/layouts/404.html
@@ -17,7 +17,7 @@
                 <div class="main-inner">
                     <h1>{{ i18n "pageNotFound" }}</h1>
                     <div class="fof-footer">
-                        <a href="{{ print `/` | relLangURL }}">{{ i18n "fofLinkText" }}</a>
+                        <a href="{{ "" | relLangURL }}">{{ i18n "fofLinkText" }}</a>
                     </div>
                 </div>
             </main>
diff --git a/layouts/index.sectionsatom.xml b/layouts/index.sectionsatom.xml
index e9a5a7e..86fa2ca 100644
--- a/layouts/index.sectionsatom.xml
+++ b/layouts/index.sectionsatom.xml
@@ -19,7 +19,7 @@
     {{ with .Site.Author.name -}}
         <author>
             <name>{{ . }}</name>
-            <uri>{{ print `/` | absLangURL }}</uri>
+            <uri>{{ "" | absLangURL }}</uri>
             {{ with $.Site.Author.email }}
                 <email>{{ . }}</email>
             {{ end -}}
diff --git a/layouts/partials/components/post-copyright.html b/layouts/partials/components/post-copyright.html
index 7265306..e6438e5 100644
--- a/layouts/partials/components/post-copyright.html
+++ b/layouts/partials/components/post-copyright.html
@@ -12,7 +12,7 @@
             {{ if $.Params.original | default $.Site.Params.original }}
                 {{ $url := urls.Parse $.Permalink }}
                 {{ $decodedPath := $url.Path }}
-                {{ $baseURLWithLangFix := (strings.TrimSuffix "/" (print `/` | absLangURL)) }}
+                {{ $baseURLWithLangFix := "" | absLangURL | strings.TrimSuffix "/" }}
                 {{ $decodedPermalink := (printf `%s%s` $baseURLWithLangFix $decodedPath) }}
                 <li class="copyright-item link"><span class="copyright-item-text">{{ i18n "copyrightLink" }}</span>{{ i18n "colon" }}<a href="{{ $.RelPermalink }}" target="_blank" rel="noopener">{{ $decodedPermalink }}</a></li>
             {{ else }}
diff --git a/layouts/partials/utils/author.html b/layouts/partials/utils/author.html
index bc5f067..3c051aa 100644
--- a/layouts/partials/utils/author.html
+++ b/layouts/partials/utils/author.html
@@ -12,7 +12,7 @@
     {{- with .Site.Author.avatar -}}
         {{- $author = merge $author (dict "avatar" .) -}}
     {{- end -}}
-    {{- $baseURLWithLangFix := (printf "%s%s/" (strings.TrimSuffix "/" .Site.BaseURL) .Site.LanguagePrefix) -}}
+    {{- $baseURLWithLangFix := "" | absLangURL -}}
     {{- with .Site.Author.website | default $baseURLWithLangFix -}}
         {{- $author = merge $author (dict "website" .) -}}
     {{- end -}}
diff --git a/layouts/partials/utils/json-ld.html b/layouts/partials/utils/json-ld.html
index 42359eb..499817c 100644
--- a/layouts/partials/utils/json-ld.html
+++ b/layouts/partials/utils/json-ld.html
@@ -3,7 +3,7 @@
 <!-- https://search.google.com/structured-data/testing-tool -->
 {{- $ := index . "$" -}}
 {{- $description := .description -}}
-{{- $baseURLWithLangFix := print `/` | absLangURL -}}
+{{- $baseURLWithLangFix := "" | absLangURL -}}
 <!-- Title -->
 {{- $rawTitle := (partial "utils/title.html" (dict "$" $ "title" $.Title)).rawTitle -}}
 <!-- Date -->
diff --git a/layouts/partials/utils/make-links-absolute.html b/layouts/partials/utils/make-links-absolute.html
index 883b896..62aa90c 100644
--- a/layouts/partials/utils/make-links-absolute.html
+++ b/layouts/partials/utils/make-links-absolute.html
@@ -1,7 +1,7 @@
 <!-- https://github.com/reuixiy/hugo-theme-meme/issues/141 -->
 {{- $ := index . "$" -}}
 {{- $content := .content -}}
-{{- $baseURL := ($.Site.BaseURL | strings.TrimSuffix "/") -}}
+{{- $baseURL := "" | absLangURL | strings.TrimSuffix "/" -}}
 {{- $content = $content | replaceRE ` (href|src)="/` (printf ` $1="%s/` $baseURL) -}}
 {{- $content = $content | replaceRE ` (href|src)="#` (printf ` $1="%s#` $.Permalink) -}}
 {{- $content | safeHTML -}}