From e7dc5eb44e5c7f6bd00c3d2337438b8481d8101b Mon Sep 17 00:00:00 2001 From: smtbook <40860032+Smtbook@users.noreply.github.com> Date: Mon, 31 Jul 2023 15:36:23 +0800 Subject: [PATCH] fix: multilingual issues in feeds and 'nav.html' --- static/feed_style/ca.xsl | 71 ++++++++++++++++++++ static/{feed_style.xsl => feed_style/en.xsl} | 2 +- static/feed_style/es.xsl | 71 ++++++++++++++++++++ templates/atom.xml | 2 +- templates/partials/nav.html | 2 +- 5 files changed, 145 insertions(+), 3 deletions(-) create mode 100644 static/feed_style/ca.xsl rename static/{feed_style.xsl => feed_style/en.xsl} (98%) create mode 100644 static/feed_style/es.xsl diff --git a/static/feed_style/ca.xsl b/static/feed_style/ca.xsl new file mode 100644 index 0000000..77955fb --- /dev/null +++ b/static/feed_style/ca.xsl @@ -0,0 +1,71 @@ + + + + + + + + <xsl:value-of select="/atom:feed/atom:title"/> • Feed + + + + + + + +
+
+
+ This is a web feed, also known as an Atom feed. Subscribe by copying the URL from the address bar into your newsreader. Visit About Feeds to learn more and get started. It’s free. +
+ + +
+

Recent Posts

+
+
+ +
+
+ +
+
+
+ + + + + + +
+
+ +
+ + + + + +
+
+ +
+
+
+ + + + diff --git a/static/feed_style.xsl b/static/feed_style/en.xsl similarity index 98% rename from static/feed_style.xsl rename to static/feed_style/en.xsl index c47a1ff..ab9c9a0 100644 --- a/static/feed_style.xsl +++ b/static/feed_style/en.xsl @@ -11,7 +11,7 @@ - +
diff --git a/static/feed_style/es.xsl b/static/feed_style/es.xsl new file mode 100644 index 0000000..ec2d89e --- /dev/null +++ b/static/feed_style/es.xsl @@ -0,0 +1,71 @@ + + + + + + + + <xsl:value-of select="/atom:feed/atom:title"/> • Feed + + + + + + + +
+
+
+ This is a web feed, also known as an Atom feed. Subscribe by copying the URL from the address bar into your newsreader. Visit About Feeds to learn more and get started. It’s free. +
+ + +
+

Recent Posts

+
+
+ +
+
+ +
+
+
+ + + + + + +
+
+ +
+ + + + + +
+
+ +
+
+
+ + + + diff --git a/templates/atom.xml b/templates/atom.xml index 2e22cd8..0359b48 100644 --- a/templates/atom.xml +++ b/templates/atom.xml @@ -1,5 +1,5 @@ - + {{ config.title }} {%- if term %} - {{ term.name }} diff --git a/templates/partials/nav.html b/templates/partials/nav.html index 10295e7..be1e159 100644 --- a/templates/partials/nav.html +++ b/templates/partials/nav.html @@ -43,7 +43,7 @@ {# Check if the language code matches the default language #} {%- if lcode == config.default_language -%} {# If it does, link to the root path (no language code in URL) #} - <a type="Button" href="{{ current_url | replace(from=current_path | default(value="") | truncate(length=4, end=""), to="/") }}">{{ language_name }}</a> + <a type="Button" href="{{ current_url | replace(from='/' ~ lang ~ '/', to = '/') }}">{{ language_name }}</a> {%- else -%} {# Check if the current language is the default language #} {%- if lang == config.default_language -%}