fix alternate URL

kimai · May 10, 2024 · fd03413 · fd03413
1 parent 1dc5de5
commit fd03413
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/_includes/link-language-domain.html b/_includes/link-language-domain.html
@@ -1,7 +1,15 @@
 {%- assign targetUrl = site.language_base[include.language] -%}
+{%- if include.url != nil -%}
+{%- assign targetUrl = targetUrl | append: include.url -%}
+{%- if site.custom_domain[include.language] -%}
+{%- assign replacer = '/' | append: include.language | append: '/' -%}
+{%- assign targetUrl = targetUrl | replace: replacer , '/' -%}
+{%- endif -%}
+{%- else -%}
 {%- unless site.custom_domain[include.language] -%}
 {%- if include.language != 'en' -%}
 {%- assign targetUrl = targetUrl | append: '/' | append: include.language -%}
 {%- endif -%}
 {%- endunless -%}
+{%- endif -%}
 {{- targetUrl -}}
diff --git a/_layouts/base.html b/_layouts/base.html
@@ -62,7 +62,7 @@
     {%- assign langPages = site[page.collection] | where: "slug", page.slug -%}
     {%- if langPages and langPages.size > 1 %}
     {%- for langPage in langPages %}
-    <link rel="alternate" hreflang="{{ langPage.lang }}" href="{{ site.language_base[langPage.lang] }}{{ langPage.url }}">
+    <link rel="alternate" hreflang="{{ langPage.lang }}" href="{% include link-language-domain.html language=langPage.lang url=langPage.url %}">
     {%- endfor %}
     {%- endif %}
     {%- endif %}