diff --git a/static/feed_style.xsl b/static/feed_style.xsl index b0fb06b..025ae81 100644 --- a/static/feed_style.xsl +++ b/static/feed_style.xsl @@ -19,7 +19,7 @@
- , . . About Feeds . . + , . . About Feeds . .
diff --git a/templates/archive.html b/templates/archive.html index 726d368..fa2beda 100644 --- a/templates/archive.html +++ b/templates/archive.html @@ -5,11 +5,7 @@ {{ macros_page_header::page_header(title=section.title) }} {# Set locale for date #} -{%- if lang != config.default_language %} - {% set date_locale = trans(key="date_locale" | safe, lang=lang) %} -{% else %} - {% set date_locale = "en_GB" %} -{% endif %} +{% set date_locale = macros_translate::translate(key="date_locale", default="en_GB") %}
- - {%- if lang != config.default_language %} {{ trans(key="read_more" | safe, lang=lang) }} {% else %} Read more {% endif %}→ + {{ macros_translate::translate(key="read_more", default="Read more") }} →
{% endif %} {% if not loop.last %} {% if loop.index == max %}
- {%- if lang != config.default_language %} {{ trans(key="all_posts" | safe, lang=lang) }} {% else %} All posts {% endif %}⟶ + {{ macros_translate::translate(key="all_posts", default="All posts") }} ⟶
{% endif %} {% endif %} diff --git a/templates/macros/paginate.html b/templates/macros/paginate.html index 9eb43e6..9d649f9 100644 --- a/templates/macros/paginate.html +++ b/templates/macros/paginate.html @@ -4,25 +4,25 @@ diff --git a/templates/macros/set_title.html b/templates/macros/set_title.html index 99578d8..fffdb28 100644 --- a/templates/macros/set_title.html +++ b/templates/macros/set_title.html @@ -26,11 +26,7 @@ {%- set suffix = term.name -%} {% elif taxonomy.name %} {# List of tags. #} - {%- if lang != config.default_language -%} - {%- set suffix = trans(key=taxonomy.name | safe, lang=lang) | capitalize -%} - {% else %} - {%- set suffix = taxonomy.name | capitalize -%} - {% endif %} + {%- set suffix = macros_translate::translate(key=taxonomy.name) | capitalize -%} {% else %} {%- set suffix = "404" %} {%- endif -%} diff --git a/templates/macros/table_of_contents.html b/templates/macros/table_of_contents.html index abd0140..d355b9b 100644 --- a/templates/macros/table_of_contents.html +++ b/templates/macros/table_of_contents.html @@ -8,7 +8,7 @@
{% if header %} -

{%- if lang != config.default_language %} {{ trans(key="table_of_contents" | safe, lang=lang) }} {% else %} Table of Contents {% endif %}

+

{{ macros_translate::translate(key="table_of_contents", default="Table of Contents") }}

{% endif %}