nick
/
tabi-test
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

♻️ refactor(translation): introduce translation macro (#129)

Browse Source
main
Óscar 2 years ago committed by GitHub
parent 3344f80539
commit 78f97e17b4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
18 changed files with 74 additions and 103 deletions
Show Stats Download Patch File Download Diff File

2
static/feed_style.xsl
Unescape Escape View File

@ -19,7 +19,7 @@
<div class="content"> <div class="content">
<main> <main>
<div class="info-box"> <div class="info-box">
<strong><xsl:value-of select="/atom:feed/str:translations/str:this_is_a_web_feed" /></strong>, <xsl:value-of select="/atom:feed/str:translations/str:also_known_as_an_Atom_feed" />. <strong><xsl:value-of select="/atom:feed/str:translations/str:subscribe" /></strong> <xsl:text> </xsl:text><xsl:value-of select="/atom:feed/str:translations/str:by_copying_the_URL_from_the_address_bar_into_your_newsreader" />.<xsl:text> </xsl:text><xsl:value-of select="/atom:feed/str:translations/str:visit" /><xsl:text> </xsl:text><a href="https://aboutfeeds.com">About Feeds</a><xsl:text> </xsl:text><xsl:value-of select="/atom:feed/str:translations/str:to_learn_more_and_get_started" />.<xsl:text> </xsl:text><xsl:value-of select="/atom:feed/str:translations/str:it_s_free" />. <strong><xsl:value-of select="/atom:feed/str:translations/str:this_is_a_web_feed"/></strong>, <xsl:value-of select="/atom:feed/str:translations/str:also_known_as_an_Atom_feed" />. <strong><xsl:value-of select="/atom:feed/str:translations/str:subscribe" /></strong> <xsl:text> </xsl:text><xsl:value-of select="/atom:feed/str:translations/str:by_copying_the_URL_from_the_address_bar_into_your_newsreader" />.<xsl:text> </xsl:text><xsl:value-of select="/atom:feed/str:translations/str:visit" /><xsl:text> </xsl:text><a href="https://aboutfeeds.com">About Feeds</a><xsl:text> </xsl:text><xsl:value-of select="/atom:feed/str:translations/str:to_learn_more_and_get_started" />.<xsl:text> </xsl:text><xsl:value-of select="/atom:feed/str:translations/str:it_s_free" />.
</div> </div>
<section id="banner-home-subtitle"> <section id="banner-home-subtitle">
<div class="padding-top home-title"> <div class="padding-top home-title">

2
templates/404.html
Unescape Escape View File

@ -11,7 +11,7 @@
{# Iterate through each language and display the localised 404 message along with a "Go Home" link #} {# Iterate through each language and display the localised 404 message along with a "Go Home" link #}
{%- for language_name, language in config.languages -%} {%- for language_name, language in config.languages -%}
{%- if language_name != config.default_language -%} {%- if language_name != config.default_language -%}
<p>{{ trans(key="404_error", lang=language_name) }} <a href="{{ config.base_url }}/{{ language_name }}/">{{ trans(key="go_home", lang=language_name) }}</a>.</p> <p>{{ macros_translate::translate(key="404_error", force_lang=language_name) }} <a href="{{ config.base_url }}/{{ language_name }}/">{{ macros_translate::translate(key="go_home", force_lang=language_name) }}</a>.</p>
{%- endif -%} {%- endif -%}
{%- endfor -%} {%- endfor -%}
</main> </main>

6
templates/archive.html
Unescape Escape View File

@ -5,11 +5,7 @@
{{ macros_page_header::page_header(title=section.title) }} {{ macros_page_header::page_header(title=section.title) }}
{# Set locale for date #} {# Set locale for date #}
{%- if lang != config.default_language %} {% set date_locale = macros_translate::translate(key="date_locale", default="en_GB") %}
{% set date_locale = trans(key="date_locale" | safe, lang=lang) %}
{% else %}
{% set date_locale = "en_GB" %}
{% endif %}
<div class="archive"> <div class="archive">
<ul class="list-with-title"> <ul class="list-with-title">

20
templates/atom.xml
Unescape Escape View File

@ -1,34 +1,36 @@
{% import "macros/translate.html" as macros_translate %}
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<?xml-stylesheet href="{{ get_url(path='/feed_style.xsl', trailing_slash=false) | safe }}" type="text/xsl"?> <?xml-stylesheet href="{{ get_url(path='/feed_style.xsl', trailing_slash=false) | safe }}" type="text/xsl"?>
<feed xmlns="http://www.w3.org/2005/Atom" xmlns:base="http://purl.org/atompub/base/1.0/" xml:lang="{{ lang }}" xml:base="{{ config.base_url }}"> <feed xmlns="http://www.w3.org/2005/Atom" xmlns:base="http://purl.org/atompub/base/1.0/" xml:lang="{{ lang }}" xml:base="{{ config.base_url }}">
{# This section stores the strings/translations for the stylised feed. If the translation is not found, the default English text will be used. #} {# This section stores the strings/translations for the stylised feed. If the translation is not found, the default English text will be used. #}
<str:translations xmlns:str="https://github.com/welpo/tabi"> <str:translations xmlns:str="https://github.com/welpo/tabi">
<str:this_is_a_web_feed> <str:this_is_a_web_feed>
{%- if lang != config.default_language -%} {{ trans(key="this_is_a_web_feed" | safe, lang=lang) }} {%- else -%} This is a web feed {%- endif -%} {{- macros_translate::translate(key="this_is_a_web_feed", default="This is a web feed") -}}
</str:this_is_a_web_feed> </str:this_is_a_web_feed>
<str:also_known_as_an_Atom_feed> <str:also_known_as_an_Atom_feed>
{%- if lang != config.default_language -%} {{ trans(key="also_known_as_an_Atom_feed" | safe, lang=lang) }} {%- else -%} also known as an Atom feed {%- endif -%} {{- macros_translate::translate(key="also_known_as_an_Atom_feed", default="also known as an Atom feed") -}}
</str:also_known_as_an_Atom_feed> </str:also_known_as_an_Atom_feed>
<str:subscribe> <str:subscribe>
{%- if lang != config.default_language -%} {{ trans(key="subscribe" | safe, lang=lang) }} {%- else -%} Subscribe {%- endif -%} {{- macros_translate::translate(key="subscribe", default="Subscribe") -}}
</str:subscribe> </str:subscribe>
<str:by_copying_the_URL_from_the_address_bar_into_your_newsreader> <str:by_copying_the_URL_from_the_address_bar_into_your_newsreader>
{%- if lang != config.default_language -%} {{ trans(key="by_copying_the_URL_from_the_address_bar_into_your_newsreader" | safe, lang=lang) }} {%- else -%} by copying the URL from the address bar into your newsreader {%- endif -%} {{- macros_translate::translate(key="by_copying_the_URL_from_the_address_bar_into_your_newsreader", default="by copying the URL from the address bar into your newsreader") -}}
</str:by_copying_the_URL_from_the_address_bar_into_your_newsreader> </str:by_copying_the_URL_from_the_address_bar_into_your_newsreader>
<str:visit> <str:visit>
{%- if lang != config.default_language -%} {{ trans(key="visit" | safe, lang=lang) }} {%- else -%} Visit {%- endif -%} {{- macros_translate::translate(key="visit", default="Visit") -}}
</str:visit> </str:visit>
<str:to_learn_more_and_get_started> <str:to_learn_more_and_get_started>
{%- if lang != config.default_language -%} {{ trans(key="to_learn_more_and_get_started" | safe, lang=lang) }} {%- else -%} to learn more and get started {%- endif -%} {{- macros_translate::translate(key="to_learn_more_and_get_started", default="to learn more and get started") -}}
</str:to_learn_more_and_get_started> </str:to_learn_more_and_get_started>
<str:it_s_free> <str:it_s_free>
{%- if lang != config.default_language -%} {{ trans(key="it_s_free" | safe, lang=lang) }} {%- else -%} It's free {%- endif -%} {{- macros_translate::translate(key="it_s_free", default="It's free") -}}
</str:it_s_free> </str:it_s_free>
<str:website> <str:website>
{%- if lang != config.default_language -%} {{ trans(key="website" | safe, lang=lang) }} {%- else -%} website {%- endif -%} {{- macros_translate::translate(key="website", default="website") -}}
</str:website> </str:website>
<str:recent_posts> <str:recent_posts>
{%- if lang != config.default_language -%} {{ trans(key="recent_posts" | safe, lang=lang) }} {%- else -%} Recent posts {%- endif -%} {{- macros_translate::translate(key="recent_posts", default="Recent posts") -}}
</str:recent_posts> </str:recent_posts>
</str:translations> </str:translations>

1
templates/base.html
Unescape Escape View File

@ -11,6 +11,7 @@
{% import "macros/set_title.html" as macros_set_title %} {% import "macros/set_title.html" as macros_set_title %}
{% import "macros/settings.html" as macros_settings %} {% import "macros/settings.html" as macros_settings %}
{% import "macros/table_of_contents.html" as macros_toc %} {% import "macros/table_of_contents.html" as macros_toc %}
{% import "macros/translate.html" as macros_translate %}
<!DOCTYPE html> <!DOCTYPE html>
<html lang="{{ lang }}" {% if config.extra.default_theme -%} <html lang="{{ lang }}" {% if config.extra.default_theme -%}

2
templates/macros/add_comments.html
Unescape Escape View File

@ -86,7 +86,7 @@
{% if automatic_loading %} {% if automatic_loading %}
<script src="{{ get_url(path='js/' ~ comment_system ~ '.min.js', trailing_slash=false) | safe }}" async></script> <script src="{{ get_url(path='js/' ~ comment_system ~ '.min.js', trailing_slash=false) | safe }}" async></script>
{% else %} {% else %}
<button id="load-comments" class="load-comments-button" data-script-src="{{ get_url(path='js/' ~ comment_system ~ '.min.js', trailing_slash=false) | safe }}">{%- if lang != config.default_language %} {{ trans(key="load_comments" | safe, lang=lang) }}{% else %} Load comments {%- endif -%}</button> <button id="load-comments" class="load-comments-button" data-script-src="{{ get_url(path='js/' ~ comment_system ~ '.min.js', trailing_slash=false) | safe }}">{{ macros_translate::translate(key="load_comments", default="Load comments") }}</button>
<script src="{{ get_url(path='js/loadComments.min.js', trailing_slash=false) | safe }}" async></script> <script src="{{ get_url(path='js/loadComments.min.js', trailing_slash=false) | safe }}" async></script>
{% endif %} {% endif %}

19
templates/macros/content.html
Unescape Escape View File

@ -54,7 +54,7 @@
<ul class="meta"> <ul class="meta">
{% if page.draft %} {% if page.draft %}
<li class="draft-label">{%- if lang != config.default_language %} {{ trans(key="draft" | safe, lang=lang) }} {% else %} DRAFT {% endif %}</li> <li class="draft-label">{{ macros_translate::translate(key="draft", default="DRAFT") }}</li>
{% endif %} {% endif %}
{% if page.date %} {% if page.date %}
@ -63,25 +63,26 @@
{# page settings override config settings #} {# page settings override config settings #}
{% if macros_settings::evaluate_setting_priority(setting="show_reading_time", page=page, default_global_value=true) == "true" %} {% if macros_settings::evaluate_setting_priority(setting="show_reading_time", page=page, default_global_value=true) == "true" %}
{{ separator }} <li title="{{ page.word_count }} {%- if lang != config.default_language %} {{ trans(key="words" | safe, lang=lang) }} {% else %} words {% endif %}">{{ page.reading_time }}{%- if lang != config.default_language %} {{ trans(key="min_read" | safe, lang=lang) }} {% else %} min read {% endif %}</li> {{ separator }} <li title="{{ page.word_count }} {{ macros_translate::translate(key="words", default="words") }}">{{ page.reading_time }}&nbsp;{{ macros_translate::translate(key="min_read", default="min read") }}</li>
{% endif %} {% endif %}
{% if page.taxonomies and page.taxonomies.tags %} {%- if page.taxonomies and page.taxonomies.tags -%}
<li>&nbsp;{{ separator }}&nbsp;{%- if lang != config.default_language -%}{{ trans(key="tags" | safe, lang=lang) | capitalize }}{% else %}Tags{%- endif -%}:&nbsp;</li> {{ separator }}&nbsp;<li>{{- macros_translate::translate(key="tags", default="tags") | capitalize -}}:&nbsp;</li>
{% for tag in page.taxonomies.tags %} {%- for tag in page.taxonomies.tags -%}
<li><a href={{ get_taxonomy_url(kind='tags', name=tag, lang=lang) | safe }}>{{ tag }}</a> <li><a href={{ get_taxonomy_url(kind='tags', name=tag, lang=lang) | safe }}>{{ tag }}</a>
{%- if not loop.last -%} {%- if not loop.last -%}
,&nbsp; ,&nbsp;
{%- endif -%} {%- endif -%}
</li> </li>
{% endfor %} {%- endfor -%}
{% endif %} {%- endif -%}
{% if page.updated %} {% if page.updated %}
</ul><ul class="meta last-updated"><li>{%- if lang != config.default_language %} {{ trans(key="last_updated_on" | safe, lang=lang) }} {% else %} Last updated on {% endif %} {{ macros_format_date::format_date(date=page.updated, short=true) }}</li> </ul><ul class="meta last-updated"><li>{{ macros_translate::translate(key="last_updated_on", default="Last updated on") }} {{ macros_format_date::format_date(date=page.updated, short=true) }}</li>
{# Show link to remote changes if enabled #} {# Show link to remote changes if enabled #}
{% if config.extra.remote_repository_url and macros_settings::evaluate_setting_priority(setting="show_remote_changes", page=page, default_global_value=true) == "true" %} {% if config.extra.remote_repository_url and macros_settings::evaluate_setting_priority(setting="show_remote_changes", page=page, default_global_value=true) == "true" %}
<li>&nbsp;{{ separator }}&nbsp;<a href="{{ macros_create_history_url::create_history_url(relative_path=page.relative_path) }}" {{ blank_target }} rel="{{ rel_attributes }}">{%- if lang != config.default_language -%}{{ trans(key="see_changes" | safe, lang=lang) }}{% else %}See changes{%- endif -%}<small> ↗</small></a></li> {{ separator }}
<li><a href="{{ macros_create_history_url::create_history_url(relative_path=page.relative_path) }}" {{ blank_target }} rel="{{ rel_attributes }}">{{ macros_translate::translate(key="see_changes", default="See changes") }}<small> ↗</small></a></li>
{% endif %} {% endif %}
{% endif %} {% endif %}
</ul> </ul>

6
templates/macros/format_date.html
Unescape Escape View File

@ -1,11 +1,7 @@
{% macro format_date(date, short) %} {% macro format_date(date, short) %}
{# Set locale #} {# Set locale #}
{%- if lang != config.default_language %} {% set date_locale = macros_translate::translate(key="date_locale", default="en_GB") %}
{% set date_locale = trans(key="date_locale" | safe, lang=lang) %}
{% else %}
{% set date_locale = "en_GB" %}
{% endif %}
{% if config.extra.short_date_format and short %} {% if config.extra.short_date_format and short %}
{{ date | date(format=config.extra.short_date_format, locale=date_locale) }} {{ date | date(format=config.extra.short_date_format, locale=date_locale) }}

5
templates/macros/list_posts.html
Unescape Escape View File

@ -37,15 +37,14 @@
<p>{{ post.summary | striptags | safe | trim_end_matches(pat=".") }}…</p> <p>{{ post.summary | striptags | safe | trim_end_matches(pat=".") }}…</p>
{% endif %} {% endif %}
</div> </div>
<a class="readmore" href={{ post.permalink }}>{{ macros_translate::translate(key="read_more", default="Read more") }}&nbsp;→</a>
<a class="readmore" href={{ post.permalink }}>{%- if lang != config.default_language %} {{ trans(key="read_more" | safe, lang=lang) }} {% else %} Read more {% endif %}→</a>
</div> </div>
</section> </section>
{% endif %} {% endif %}
{% if not loop.last %} {% if not loop.last %}
{% if loop.index == max %} {% if loop.index == max %}
<div class="all-posts"> <div class="all-posts">
<a href="{{ get_url(path="blog", lang=lang) }}/">{%- if lang != config.default_language %} {{ trans(key="all_posts" | safe, lang=lang) }} {% else %} All posts {% endif %}⟶</a> <a href="{{ get_url(path="blog", lang=lang) }}/">{{ macros_translate::translate(key="all_posts", default="All posts") }}&nbsp;⟶</a>
</div> </div>
{% endif %} {% endif %}
{% endif %} {% endif %}

10
templates/macros/paginate.html
Unescape Escape View File

@ -4,25 +4,25 @@
<ul class="pagination"> <ul class="pagination">
{% if paginator.previous %} {% if paginator.previous %}
<li class="page-item page-prev"> <li class="page-item page-prev">
<a href="{{ paginator.previous }}" class="page-link" aria-label="{%- if lang != config.default_language %} {{ trans(key="prev" | safe, lang=lang) }}{% else %} Prev {%- endif -%}">← {%- if lang != config.default_language %} {{ trans(key="prev" | safe, lang=lang) }}{% else %} Prev {%- endif -%}</a> <a href="{{ paginator.previous }}" class="page-link" aria-label="{{ macros_translate::translate(key="prev", default="Prev") }}">← {{ macros_translate::translate(key="prev", default="Prev") }}</a>
</li> </li>
{% else %} {% else %}
<li class="page-item page-prev"> <li class="page-item page-prev">
<span class="page-link disabled" aria-disabled="true" aria-label="{%- if lang != config.default_language %} {{ trans(key="prev" | safe, lang=lang) }}{% else %} Prev {%- endif -%} (disabled)">← {%- if lang != config.default_language %} {{ trans(key="prev" | safe, lang=lang) }}{% else %} Prev {%- endif -%}</span> <span class="page-link disabled" aria-disabled="true" aria-label="{{ macros_translate::translate(key="prev", default="Prev") }} (disabled)">← {{ macros_translate::translate(key="prev", default="Prev") }}</span>
</li> </li>
{% endif %} {% endif %}
<li class="page-item page-numbers"> <li class="page-item page-numbers">
{{ paginator.current_index }} {%- if lang != config.default_language %} {{ trans(key="of" | safe, lang=lang) }}{% else %} of {%- endif %} {{ paginator.number_pagers }} {{ paginator.current_index }} {{ macros_translate::translate(key="of", default="of") }} {{ paginator.number_pagers }}
</li> </li>
{% if paginator.next %} {% if paginator.next %}
<li class="page-item page-next"> <li class="page-item page-next">
<a href="{{ paginator.next }}" class="page-link" aria-label="{%- if lang != config.default_language %} {{ trans(key="next" | safe, lang=lang) }}{% else %} Next {%- endif -%}">{%- if lang != config.default_language %} {{ trans(key="next" | safe, lang=lang) }}{% else %} Next {%- endif %} →</a> <a href="{{ paginator.next }}" class="page-link" aria-label="{{ macros_translate::translate(key="next", default="Next") }}">{{ macros_translate::translate(key="next", default="Next") }} →</a>
</li> </li>
{% else %} {% else %}
<li class="page-item page-next"> <li class="page-item page-next">
<span class="page-link disabled" aria-disabled="true" aria-label="{%- if lang != config.default_language %} {{ trans(key="next" | safe, lang=lang) }}{% else %} Next {%- endif -%} (disabled)">{%- if lang != config.default_language %} {{ trans(key="next" | safe, lang=lang) }}{% else %} Next {%- endif %} →</span> <span class="page-link disabled" aria-disabled="true" aria-label="{{ macros_translate::translate(key="next", default="Next") }} (disabled)">{{ macros_translate::translate(key="next", default="Next") }} →</span>
</li> </li>
{% endif %} {% endif %}
</ul> </ul>

6
templates/macros/set_title.html
Unescape Escape View File

@ -26,11 +26,7 @@
{%- set suffix = term.name -%} {%- set suffix = term.name -%}
{% elif taxonomy.name %} {% elif taxonomy.name %}
{# List of tags. #} {# List of tags. #}
{%- if lang != config.default_language -%} {%- set suffix = macros_translate::translate(key=taxonomy.name) | capitalize -%}
{%- set suffix = trans(key=taxonomy.name | safe, lang=lang) | capitalize -%}
{% else %}
{%- set suffix = taxonomy.name | capitalize -%}
{% endif %}
{% else %} {% else %}
{%- set suffix = "404" %} {%- set suffix = "404" %}
{%- endif -%} {%- endif -%}

2
templates/macros/table_of_contents.html
Unescape Escape View File

@ -8,7 +8,7 @@
<div class="toc-container"> <div class="toc-container">
{% if header %} {% if header %}
<h3>{%- if lang != config.default_language %} {{ trans(key="table_of_contents" | safe, lang=lang) }} {% else %} Table of Contents {% endif %}</h3> <h3>{{ macros_translate::translate(key="table_of_contents", default="Table of Contents") }}</h3>
{% endif %} {% endif %}
<ul> <ul>

14
templates/macros/translate.html
Unescape Escape View File

@ -0,0 +1,14 @@
{% macro translate(key, default="", force_lang="") %}
{%- if config.default_language != "en" -%}
{#- The entire site should be translated -#}
{{- trans(key=key | safe, lang=lang) -}}
{%- elif lang != config.default_language -%}
{{- trans(key=key | safe, lang=lang) -}}
{%- elif force_lang -%}
{{- trans(key=key | safe, lang=force_lang) -}}
{%- else -%}
{{- default -}}
{%- endif -%}
{% endmacro %}

26
templates/partials/footer.html
Unescape Escape View File

@ -64,36 +64,24 @@
{%- if config.extra.copyright -%} {%- if config.extra.copyright -%}
{% set current_year = now() | date(format="%Y") %} {% set current_year = now() | date(format="%Y") %}
{# Translate the copyright if set in the config #} {# Translate the copyright if set in the config #}
{%- if config.extra.translate_copyright and lang != config.default_language -%} {%- if config.extra.translate_copyright -%}
<p>{{ trans(key="copyright", lang=lang) | replace(from="$CURRENT_YEAR", to=current_year) | replace(from="$SEPARATOR", to=separator) | markdown | safe }}</p> <p>{{ macros_translate::translate(key="copyright", default=config.extra.copyright) | replace(from="$CURRENT_YEAR", to=current_year) | replace(from="$SEPARATOR", to=separator) | markdown | safe }}</p>
{%- else -%} {%- else -%}
<p>{{ config.extra.copyright | replace(from="$CURRENT_YEAR", to=current_year) | replace(from="$SEPARATOR", to=separator) | markdown | safe }}</p> <p>{{ config.extra.copyright | replace(from="$CURRENT_YEAR", to=current_year) | replace(from="$SEPARATOR", to=separator) | markdown | safe }}</p>
{%- endif -%} {%- endif -%}
{%- endif -%} {%- endif -%}
{# Shows "Powered by Zola & tabi" notice #} {# Shows "Powered by Zola & tabi" notice #}
{%- if lang != config.default_language -%} {{ macros_translate::translate(key="powered_by", default="Powered by") }}
{{ trans(key="powered_by" | safe, lang=lang) }} <a rel="{{ rel_attributes }}" {{ blank_target }} href="https://www.getzola.org">Zola</a>
{%- else -%} {{ macros_translate::translate(key="and", default="&") }}
Powered by <a rel="{{ rel_attributes }}" {{ blank_target }} href="https://github.com/welpo/tabi">tabi</a>
{%- endif -%}
&nbsp;<a rel="{{ rel_attributes }}" {{ blank_target }} href="https://www.getzola.org">Zola</a>&nbsp;
{%- if lang != config.default_language -%}
{{ trans(key="and" | safe, lang=lang) }}
{%- else -%}
&
{%- endif -%}
&nbsp;<a rel="{{ rel_attributes }}" {{ blank_target }} href="https://github.com/welpo/tabi">tabi</a>
{# Shows link to remote repository #} {# Shows link to remote repository #}
{%- if config.extra.remote_repository_url and config.extra.show_remote_source | default(value=true) -%} {%- if config.extra.remote_repository_url and config.extra.show_remote_source | default(value=true) -%}
{{ separator }} {{ separator }}
<a rel="{{ rel_attributes }}" {{ blank_target }} href="{{ config.extra.remote_repository_url }}"> <a rel="{{ rel_attributes }}" {{ blank_target }} href="{{ config.extra.remote_repository_url }}">
{%- if lang != config.default_language -%} {{ macros_translate::translate(key="site_source", default="Site source") }}
{{ trans(key="site_source" | safe, lang=lang) }}
{%- else -%}
Site source
{%- endif -%}
</a> </a>
{%- endif -%} {%- endif -%}
</small> </small>

12
templates/partials/nav.html
Unescape Escape View File

@ -12,11 +12,7 @@
<li> <li>
{% set trailing_slash = menu.trailing_slash | default(value=true) %} {% set trailing_slash = menu.trailing_slash | default(value=true) %}
<a class="nav-links no-hover-padding" href="{{ get_url(path=menu.url, lang=lang, trailing_slash=trailing_slash) }}"/> <a class="nav-links no-hover-padding" href="{{ get_url(path=menu.url, lang=lang, trailing_slash=trailing_slash) }}"/>
{%- if lang != config.default_language -%} {{ macros_translate::translate(key=menu.name, default=menu.name) }}
{{ trans(key=menu.name | safe, lang=lang) }}
{%- else -%}
{{ menu.name | safe }}
{%- endif -%}
</a> </a>
</li> </li>
{% endfor %} {% endfor %}
@ -31,11 +27,7 @@
{# Display the current language first in the dropdown #} {# Display the current language first in the dropdown #}
<div class="dropdown-content"> <div class="dropdown-content">
{%- if lang != config.default_language %} {{ macros_translate::translate(key="language_name", default=config.extra.language_name.en) }}
{{ trans(key="language_name" | safe, lang=lang) }}
{% else %}
{{ config.extra.language_name.en }}
{%- endif %}
{# Loop through all the available languages in the config #} {# Loop through all the available languages in the config #}
{%- for lcode, language_name in config.extra.language_name -%} {%- for lcode, language_name in config.extra.language_name -%}

32
templates/shortcodes/multilingual_quote.html
Unescape Escape View File

@ -1,15 +1,12 @@
{%- if lang != config.default_language -%} {%- import "macros/translate.html" as macros_translate -%}
{%- set open_quote = trans(key="open_quotation_mark" | safe, lang=lang) -%}
{%- set close_quote = trans(key="close_quotation_mark" | safe, lang=lang) -%}
{%- else -%}
{%- set open_quote = "“" -%}
{%- set close_quote = "”" -%}
{%- endif -%}
{# The `random_id` ensures that each instance of the shortcode has a "unique" id #} {%- set open_quote = macros_translate::translate(key="open_quotation_mark", default="“") -%}
{# allowing individual interactive elements (like toggles) to function correctly. #} {%- set close_quote = macros_translate::translate(key="close_quotation_mark", default="”") -%}
{# This avoids conflicts when multiple instances of the shortcode are used. #}
{# More context: https://github.com/welpo/tabi/issues/82 #} {#- The `random_id` ensures that each instance of the shortcode has a "unique" id -#}
{#- allowing individual interactive elements (like toggles) to function correctly. -#}
{#- This avoids conflicts when multiple instances of the shortcode are used. -#}
{#- More context: https://github.com/welpo/tabi/issues/82 -#}
{%- set random_id = get_random(end=100000) -%} {%- set random_id = get_random(end=100000) -%}
<div class="quote-container"> <div class="quote-container">
@ -19,22 +16,15 @@
<blockquote> <blockquote>
<p>{{ open_quote ~ translated ~ close_quote }}</p> <p>{{ open_quote ~ translated ~ close_quote }}</p>
<p> — {{ author }} <label for="toggle-{{ random_id }}" class="quote-label quote-label-original"> <p> — {{ author }} <label for="toggle-{{ random_id }}" class="quote-label quote-label-original">
({%- if lang != config.default_language -%} ({{- macros_translate::translate(key="show_original_quote", default="Show original quote") -}})
{{ trans(key="show_original_quote" | safe, lang=lang) }} </label></p>
{%- else -%}
Show original quote
{%- endif -%})</label></p>
</blockquote> </blockquote>
</div> </div>
<div class="original"> <div class="original">
<blockquote> <blockquote>
<p>{{ open_quote ~ original ~ close_quote }}</p> <p>{{ open_quote ~ original ~ close_quote }}</p>
<p> — {{ author }} <label for="toggle-{{ random_id }}" class="quote-label quote-label-translate"> <p> — {{ author }} <label for="toggle-{{ random_id }}" class="quote-label quote-label-translate">
({%- if lang != config.default_language -%} ({{- macros_translate::translate(key="show_translation", default="Show translation") -}})
{{ trans(key="show_translation" | safe, lang=lang) }}
{%- else -%}
Show translation
{%- endif -%})
</label></p> </label></p>
</blockquote> </blockquote>
</div> </div>

10
templates/tags/list.html
Unescape Escape View File

@ -2,11 +2,7 @@
{% block main_content %} {% block main_content %}
{%- if lang != config.default_language %} {%- set title = macros_translate::translate(key="tags_title", default="All tags") -%}
{% set title = trans(key="tags_title" | safe, lang=lang) %}
{% else %}
{% set title = "All tags" %}
{% endif %}
{{ macros_page_header::page_header(title=title)}} {{ macros_page_header::page_header(title=title)}}
@ -17,10 +13,10 @@
{{ term.name }}</a> {{ term.name }}</a>
– {{ term.pages | length }}{%- if term.pages | length == 1 %} – {{ term.pages | length }}{%- if term.pages | length == 1 %}
{# Only one post. Singular. #} {# Only one post. Singular. #}
{%- if lang != config.default_language %} {{ trans(key="post" | safe, lang=lang) }}{% else %} post {%- endif -%} {{- macros_translate::translate(key="post", default="post") -}}
{% elif term.pages | length > 1 %} {% elif term.pages | length > 1 %}
{# More than one post per tag. Plural. #} {# More than one post per tag. Plural. #}
{%- if lang != config.default_language %} {{ trans(key="posts" | safe, lang=lang) }}{% else %} posts {%- endif -%} {{- macros_translate::translate(key="posts", default="posts") -}}
{%- endif -%} {%- endif -%}
</li> </li>
{%- endfor -%} {%- endfor -%}

2
templates/tags/single.html
Unescape Escape View File

@ -9,7 +9,7 @@
<ul class="pagination"> <ul class="pagination">
<li class="page-item"> <li class="page-item">
<a class="all-tags" href="{{ get_url(path="tags", lang=lang) }}/">← {%- if lang != config.default_language %} {{ trans(key="all_tags" | safe, lang=lang) }}{% else %} All tags {%- endif -%}</a> <a class="all-tags" href="{{ get_url(path="tags", lang=lang) }}/">←&nbsp;{{- macros_translate::translate(key="all_tags", default="All tags") -}}</a>
</li> </li>
</ul> </ul>

Write Preview
Loading…
Cancel
Save