diff --git a/databags/translate.ini b/databags/translate.ini index 3fcabeeef1..855d782389 100644 --- a/databags/translate.ini +++ b/databags/translate.ini @@ -12,7 +12,7 @@ previous = Previous next = Next ; Incomplete -incomplete_text = This page's contents is incomplete. You can help by +incomplete_text = This page's contents are incomplete. You can help by incomplete_link = expanding it incomplete_after_link_text = . incomplete_space_before_link = true @@ -132,10 +132,7 @@ polish = Polski ; Breadcrumbs home = الرئيسية edit_on_github = عدِّل على GitHub -create_on_github = ترجم على GitHub -translation_out_of_date = ترجمة هذا المحتوى تحتاج إلى تحديث -see_original_content = تحقق مما تم تحديثُه في المحتوى الأصلى -update_translation = قم بتحديث الترجمة على Github +edit_translation = الترجمة على Weblate ; Footer sitemap = خريطة الموقع @@ -247,10 +244,7 @@ missing_translations = الصفحات التالية تفتقد إلى التر ; Breadcrumbs home = Início edit_on_github = Editar no GitHub -create_on_github = Traduzir no GitHub -translation_out_of_date = Esta tradução está desatualizada! -see_original_content = Veja o que mudou na versão original -update_translation = Atualizar tradução no Github +edit_translation = Traduzir no Weblate ; Footer sitemap = Mapa do site @@ -362,10 +356,7 @@ missing_translations = As páginas a seguir não possuem tradução ; Breadcrumbs home = 主頁 edit_on_github = 在 GitHub 上編輯 -create_on_github = 在 GitHub 上翻譯 -translation_out_of_date = 這個頁面的翻譯可能已經過時！ -see_original_content = 看看原來的內容有什麼變化 -update_translation = 在 Github 上更新翻譯 +edit_translation = 在 Weblate 上翻譯 ; Footer sitemap = 網站地圖 @@ -477,10 +468,7 @@ missing_translations = The following pages are missing a translation ; Breadcrumbs home = Inicio edit_on_github = Editar en GitHub -create_on_github = Traducir en GitHub -translation_out_of_date = El contenido y/o traducción de esta página puede estar desactualizado! -see_original_content = Ver que ha cambiado -update_translation = Actualizar el contenido en Github +edit_translation = Traducir en Weblate ; Footer sitemap = Mapa del Sitio @@ -592,10 +580,7 @@ outdated_translations = Las siguientes páginas pueden contener traducciones des ; Breadcrumbs home = Accueil edit_on_github = Editer sur GitHub -create_on_github = Traduire sur GitHub -translation_out_of_date = Cette traduction du contenu original est obsolète! -see_original_content = Voir les modifications du contenu original -update_translation = Mettre à jour la traduction sur Github +edit_translation = Traduire sur Weblate ; Footer sitemap = Plan du site @@ -707,10 +692,7 @@ missing_translations = Les pages suivantes n'ont pas de traduction ; Breadcrumbs home = Home edit_on_github = Modifica su GitHub -create_on_github = Tradurre su GitHub -translation_out_of_date = Questa traduzione del contenuto originale non è aggiornata! -see_original_content = Vedi cosa è cambiato nel contenuto originale -update_translation = Aggiorna la traduzione su Github +edit_translation = Traduci su Weblate ; Footer sitemap = Mappa del sito @@ -822,10 +804,7 @@ missing_translations = Alle seguenti pagine manca una traduzione ; Breadcrumbs home = Strona główna edit_on_github = Edytuj na GitHubie -create_on_github = Tłumacz na GitHubie -translation_out_of_date = To tłumaczenie jest nieaktualne! -see_original_content = Zobacz co zmieniło się na oryginalnej stronie -update_translation = Zaktualizuj tłumaczenie na Githubie +edit_translation = Tłumacz na Weblate ; Footer sitemap = Mapa strony @@ -937,10 +916,7 @@ missing_translations = Na tych stronach brakuje tłumaczenia ; Breadcrumbs home = 首页 edit_on_github = 在GitHub上编辑 -create_on_github = 在GitHub上翻译 -translation_out_of_date = 这份原始内容的翻译已经过时了！ -see_original_content = 查看原始内容的变化 -update_translation = 在Github上更新翻译 +edit_translation = 在Weblate上翻译 ; Footer sitemap = 站点地图 diff --git a/packages/lektor_beeware_plugin/lektor_beeware_plugin.py b/packages/lektor_beeware_plugin/lektor_beeware_plugin.py index eb21b00875..81d5d40dcb 100644 --- a/packages/lektor_beeware_plugin/lektor_beeware_plugin.py +++ b/packages/lektor_beeware_plugin/lektor_beeware_plugin.py @@ -1,14 +1,30 @@ # -*- coding: utf-8 -*- -"""This is a custom local plugin to add extra functionality to BeeWare site.""" +"""This is a custom local plugin to add extra functionality to the BeeWare site.""" from datetime import date from lektor.pluginsystem import Plugin +from jinja2 import pass_context + + +@pass_context +def translate(context, string, bag_name="translate"): + # Make sure that any macros which need to call this are imported with context. + alt = context["this"].alt + bag = context["bag"] + if trans := bag(f"{bag_name}.{alt}.{string}"): + return trans + + if en := bag(f"{bag_name}.en.{string}"): + return en + + return "" class BeeWarePlugin(Plugin): - name = 'BeeWare Custom Lektor Plugin' - description = 'This is a custom local plugin to add extra functionality.' + name = "BeeWare Custom Lektor Plugin" + description = "This is a custom local plugin to add extra functionality." def on_setup_env(self, **extra): - self.env.jinja_env.globals['today'] = date.today() + self.env.jinja_env.globals["today"] = date.today() + self.env.jinja_env.filters["trans"] = translate diff --git a/packages/lektor_beeware_plugin/pyproject.toml b/packages/lektor_beeware_plugin/pyproject.toml index 1ba263af6e..bbf8ef3314 100644 --- a/packages/lektor_beeware_plugin/pyproject.toml +++ b/packages/lektor_beeware_plugin/pyproject.toml @@ -13,7 +13,7 @@ description = "" license = "MIT" requires-python = ">= 3.9" authors = [ - {name="Gonzalo Peña-Castellanos", email="goanpeca@gmail.com"}, + {name="Charles Whittington", email="charleswhitt@gmail.com"}, ] maintainers = [ {name="BeeWare Team", email="team@beeware.org"}, diff --git a/templates/404.html b/templates/404.html index 86ebccdbb5..885c129214 100644 --- a/templates/404.html +++ b/templates/404.html @@ -1,6 +1,6 @@ {% extends "layout.html" %} -{% from "macros/breadcrumbs.html" import breadcrumbs %} -{% from "macros/incomplete.html" import incomplete %} +{% from "macros/breadcrumbs.html" import breadcrumbs with context %} +{% from "macros/incomplete.html" import incomplete with context %} {% block title %}Page not found{% endblock %} {% block preamble %} diff --git a/templates/blog-post.html b/templates/blog-post.html index bbcecca3dc..208246fd03 100644 --- a/templates/blog-post.html +++ b/templates/blog-post.html @@ -1,12 +1,6 @@ {% extends "layout.html" %} -{% from "macros/blog.html" import render_blog_post %} -{% from "macros/breadcrumbs.html" import breadcrumbs %} -{% from "macros/translation.html" import transbag %} - -{% set t_on = transbag('translate', this.alt, 'on') %} -{% set t_posted_by = transbag('translate', this.alt, 'posted_by') %} -{% set t_next_entry = transbag('translate', this.alt, 'next_entry') %} -{% set t_previous_entry = transbag('translate', this.alt, 'previous_entry') %} +{% from "macros/blog.html" import render_blog_post with context %} +{% from "macros/breadcrumbs.html" import breadcrumbs with context %} {% block title %}{{ this.title }}{% endblock %} {% block preamble %} @@ -14,7 +8,7 @@

{{ breadcrumbs(this) }}

{{ this.title }}

-

{{ t_posted_by }} +

{{ "posted_by"|trans }} {% if this.mastodon_handle %} {{ this.author or this.mastodon_handle }} {% elif this.twitter_handle %} @@ -22,7 +16,7 @@

{{ this.title }}

{% else %} {{ this.author }} {% endif %} - {{ t_on }} {{ this.pub_date.strftime('%Y/%m/%d')}} + {{ "on"|trans }} {{ this.pub_date.strftime('%Y/%m/%d')}}

@@ -37,12 +31,12 @@

{{ this.title }}

{% if this.has_prev() %} -
{{ t_next_entry }}
+
{{ "next_entry"|trans }}
{{ this.get_siblings().prev_page.title }}
{% endif %} {% if this.has_next() %} -
{{ t_previous_entry }}
+
{{ "previous_entry"|trans }}
{{ this.get_siblings().next_page.title }}
{% endif %}
diff --git a/templates/blog.html b/templates/blog.html index 36d4ec68a1..4cac69399e 100644 --- a/templates/blog.html +++ b/templates/blog.html @@ -1,7 +1,7 @@ {% extends "page.html" %} -{% from "macros/blog.html" import render_blog_post %} -{% from "macros/pagination.html" import render_pagination %} -{% from "macros/breadcrumbs.html" import breadcrumbs %} +{% from "macros/blog.html" import render_blog_post with context %} +{% from "macros/pagination.html" import render_pagination with context %} +{% from "macros/breadcrumbs.html" import breadcrumbs with context %} {% block title %}{{ this.title }}{% endblock %} {% block extra_head %} diff --git a/templates/community.html b/templates/community.html index 034ebbea1e..4fdf51217f 100644 --- a/templates/community.html +++ b/templates/community.html @@ -1,5 +1,5 @@ {% extends "page.html" %} -{% from "macros/breadcrumbs.html" import breadcrumbs %} +{% from "macros/breadcrumbs.html" import breadcrumbs with context %} {% block title %}{{ this.title }}{% endblock %} {% block gutter %} diff --git a/templates/event.html b/templates/event.html index 6bfac29c98..a65208bc0e 100644 --- a/templates/event.html +++ b/templates/event.html @@ -1,37 +1,20 @@ {% extends "page.html" %} -{% from "macros/breadcrumbs.html" import breadcrumbs %} -{% from "macros/translation.html" import transbag %} -{% from "macros/join_and.html" import join_and %} - -{% set t_running_sprint = transbag('translate', this.alt, 'running_sprint') %} -{% set t_what_is_a_sprint = transbag('translate', this.alt, 'what_is_a_sprint') %} -{% set t_challenge_coin = transbag('translate', this.alt, 'challenge_coin') %} -{% set t_sprint_description = transbag('translate', this.alt, 'sprint_description') %} -{% set t_sprint_video = transbag('translate', this.alt, 'sprint_pycon_video') %} -{% set t_post_sprint_pycon_video = transbag('translate', this.alt, 'post_sprint_pycon_video') %} -{% set t_date = transbag('translate', this.alt, 'date') %} -{% set t_speakers = transbag('translate', this.alt, 'speakers') %} -{% set t_sprinters = transbag('translate', this.alt, 'sprinters') %} -{% set t_and = transbag('translate', this.alt, 'and') %} -{% set t_event_more_info = transbag('translate', this.alt, 'event_more_info') %} -{% set t_website = transbag('translate', this.alt, 'website') %} - -{% set t_sprint_helping = transbag('translate', this.alt, 'sprint_helping') %} -{% set t_sprint_helping_plural = transbag('translate', this.alt, 'sprint_helping_plural') %} +{% from "macros/breadcrumbs.html" import breadcrumbs with context %} +{% from "macros/join_and.html" import join_and with context %} {% set event_type_verbs = { "talk": { - "before": transbag('translate', this.alt, 'speaking_before_title'), - "after": transbag('translate', this.alt, 'speaking_after_title'), + "before": "speaking_before_title"|trans, + "after": "speaking_after_title"|trans, }, "keynote": { - "before": transbag('translate', this.alt, 'keynoting_before_title'), - "after": transbag('translate', this.alt, 'keynoting_after_title'), + "before": "keynoting_before_title"|trans, + "after": "keynoting_after_title"|trans, }, "tutorial": { - "before": transbag('translate', this.alt, 'tutorial_before_title'), - "after": transbag('translate', this.alt, 'tutorial_after_title'), + "before": "tutorial_before_title"|trans, + "after": "tutorial_after_title"|trans, }, } %} @@ -47,7 +30,7 @@ ) %} {% endfor %} -{% set t_speakers_list = join_and(speaker_names.values()|list, t_and) %} +{% set speakers_list = join_and(speaker_names.values()|list) %} {% block title %}{{ this.title }}{% endblock %} @@ -63,15 +46,16 @@

{{ this.title }} ({{ this.event_type|title }})

{% block main %} {% if this.event_type in event_type_verbs %} -

{{ t_speakers_list }} {{ event_type_verbs[this.event_type]["before"] }} {{ this.title }} {{ event_type_verbs[this.event_type]["after"] }} "{{ this.talk_title }}".

+

{{ speakers_list }} {{ event_type_verbs[this.event_type]["before"] }} {{ this.title }} {{ event_type_verbs[this.event_type]["after"] }} "{{ this.talk_title }}".

{% elif this.event_type == "sprint" %} -

{{ t_running_sprint }} {{ this.title }}.

+

{{ "running_sprint"|trans }} {{ this.title }}.

- {{ t_speakers_list }} {% if this.speaker|length > 1 %}{{ t_sprint_helping_plural }}{% else %}{{ t_sprint_helping }}{% endif %} {{ t_challenge_coin }}. + {{ speakers_list }} {% if this.speaker|length > 1 %}{{ "sprint_helping_plural"|trans }}{% else %}{{ "sprint_helping"|trans }}{% endif %} {{ "challenge_coin"|trans }}.

-

{{ t_event_more_info }} {{ this.title }} {{ t_website }}.

-

{{ t_what_is_a_sprint }}

-

{{ t_sprint_description }} {{ t_sprint_video }} {{ t_post_sprint_pycon_video }}

+

{{ "event_more_info"|trans }} {{ this.title }} {{ "website"|trans }}.

+

{{ "what_is_a_sprint"|trans }}

+ {%- set post = "post_sprint_pycon_video"|trans %} +

{{ "sprint_description"|trans }} {{ "sprint_pycon_video"|trans }}{% if post %} {% endif %}{{ post }}.

{% endif %}

{{ this.description }}

{% endblock %} @@ -79,13 +63,13 @@

{{ t_what_is_a_sprint }}

{% block gutter %}
-
{{ t_date }}:
+
{{ "date"|trans }}:
{{ this.date|datetimeformat("MMMM d, YYYY", locale=this.alt)|title }}{% if this.end_date %} - {{this.end_date|datetimeformat("MMMM d, YYYY", locale=this.alt)|title}}{% endif %}
{% if this.event_type == "sprint" %} -
{{ t_sprinters }}:
+
{{ "sprinters"|trans }}:
{% elif this.event_type == "talk" %} -
{{ t_speakers }}:
+
{{ "speakers"|trans }}:
{% endif %}
    diff --git a/templates/events.html b/templates/events.html index dd6d4cadb4..f3e15e4538 100644 --- a/templates/events.html +++ b/templates/events.html @@ -1,9 +1,5 @@ {% extends "page.html" %} -{% from "macros/breadcrumbs.html" import breadcrumbs %} -{% from "macros/translation.html" import transbag %} - -{% set t_past_events = transbag('translate', this.alt, 'past_events') %} -{% set t_upcoming_events = transbag('translate', this.alt, 'upcoming_events') %} +{% from "macros/breadcrumbs.html" import breadcrumbs with context %} {% block title %}{{ this.title }}{% endblock %} @@ -38,10 +34,10 @@

    {{ this.title }}

    and use Javascript (which will be evaluated at the time of viewing) to move upcoming events into the upcoming list. #} -

    {{ t_upcoming_events }}

    +

    {{ "upcoming_events"|trans }}

    -

    {{ t_past_events }}

    +

    {{ "past_events"|trans }}

    {% for child in this.children %}

    diff --git a/templates/home.html b/templates/home.html index 15301d565b..eff0091864 100644 --- a/templates/home.html +++ b/templates/home.html @@ -1,19 +1,4 @@ {% extends "layout.html" %} -{% from "macros/translation.html" import transbag %} - -{% set t_projects = transbag('translate', this.alt, 'projects') %} -{% set t_latest_news = transbag('translate', this.alt, 'latest_news') %} -{% set t_previous = transbag('translate', this.alt, 'previous') %} -{% set t_next = transbag('translate', this.alt, 'next') %} -{% set t_meet_team = transbag('translate', this.alt, 'meet_team') %} -{% set t_keynoting = transbag('translate', this.alt, 'keynoting') %} -{% set t_speaking = transbag('translate', this.alt, 'speaking') %} -{% set t_tutorial = transbag('translate', this.alt, 'tutorial') %} -{% set t_come_see_us = transbag('translate', this.alt, 'come_see_us') %} -{% set t_sprinting = transbag('translate', this.alt, 'sprinting') %} -{% set t_member = transbag('translate', this.alt, 'member')|trim %} - -{% set t_gold_member = transbag('labels', this.alt, 'gold') %} {% block title %}{{ this.title }}{% endblock %} {% block preamble %} diff --git a/templates/home_sidebar.html b/templates/home_sidebar.html index 4dcdf0172b..6eb8d44cc9 100644 --- a/templates/home_sidebar.html +++ b/templates/home_sidebar.html @@ -1,19 +1,19 @@ {{ this.gutter_top }} -

    {{ t_gold_member }} {{ t_member|capitalize }}

    +

    {{ "gold"|trans("labels") }} {{ "member"|trans|capitalize }}

    {% for member in gold_members %}

    {% endfor %}
    -

    {{ t_latest_news }}

    +

    {{ "latest_news"|trans }}

    {{ blog.pub_date.strftime("%d %b")}}: {{ blog.title }}

    {% if events %} -

    {{ t_meet_team }}

    +

    {{ "meet_team"|trans }}

    {% for event in events %}
    @@ -30,7 +30,7 @@
    {{ event.title }}
    {% endif %} -

    {{ t_projects }}

    +

    {{ "projects"|trans }}

    {% for project in project_types %} {% if not project.project_page_description %}
    diff --git a/templates/layout.html b/templates/layout.html index 8e5373febc..441dea7fd6 100644 --- a/templates/layout.html +++ b/templates/layout.html @@ -1,20 +1,12 @@ -{%- from "macros/translation.html" import transbag -%} - {%- macro menu_item(identifier) -%} {%- set identifier_url = '/' + identifier -%} {%- set trans_url = identifier_url|url(alt=this.alt) -%} {%- set this_is_child = this.is_child_of(identifier_url) -%}
  • - {{- transbag('menu', this.alt, identifier) -}}{%- if this_is_child -%}(current){%- endif -%} + {{ identifier|trans("menu") }}{%- if this_is_child -%}(current){%- endif -%}
    • {%- endmacro -%} -{%- set t_languages = transbag('menu', this.alt, 'languages') -%} -{%- set t_sitemap = transbag('translate', this.alt, 'sitemap') -%} -{%- set t_welcome = transbag('translate', this.alt, 'welcome') -%} -{%- set t_edit_on_github = transbag('translate', this.alt, 'edit_on_github') -%} -{%- set t_edit_translation = transbag('translate', this.alt, 'edit_translation') -%} - @@ -23,7 +15,7 @@ - {%- block title %}{{- t_welcome -}}{% endblock -%} — BeeWare + {%- block title %}{{- "welcome"|trans -}}{% endblock -%} — BeeWare @@ -40,11 +32,6 @@ - {%- if diff -%} - - {{- get_pygments_css_styles('default')|safe -}} - {%- endif -%} - {%- if this.alt in ['ar', 'fa'] -%} {%- endif -%} @@ -85,7 +72,7 @@ {{ menu_item('news') }}
  • - {{ transbag('menu', this.alt, 'donate') }} + {{ "donate"|trans("menu") }}
@@ -97,7 +84,7 @@ + this.path.split("@")[0] + "/contents.lr" ) -%} - {%- set edit_text = t_edit_on_github -%} + {%- set edit_text = "edit_on_github"|trans -%} {%- set icon_name = "github" -%} {%- else -%} {%- set edit_link = ( @@ -105,7 +92,7 @@ + {"zh_CN": "zh_Hans", "zh_TW": "zh_Hant"}.get(this.alt, this.alt[:2]) ) -%} - {%- set edit_text = t_edit_translation -%} + {%- set edit_text = "edit_translation"|trans -%} {# Font Awesome doesn't have a Weblate icon. #} {%- set icon_name = "pencil" -%} {%- endif -%} @@ -127,7 +114,7 @@ {%- set alt_active = alt == this.alt -%} {%- if alt != config.primary_alternative %} - {{- transbag('translate', alt, alternative.name.en.lower()) -}} + {{- alternative.name.en.lower()|trans -}} {%- endif -%} {%- endfor %} @@ -154,7 +141,7 @@ GitHub | Discord | Mastodon | - {{ t_sitemap }} + {{ "sitemap"|trans }}

GitHub | @@ -162,7 +149,7 @@ Mastodon

- {{ t_sitemap }} + {{ "sitemap"|trans }}

{% set team = site.query('/about/team', alt=this.alt).all() %} {% for member in team %} diff --git a/templates/macros/article.html b/templates/macros/article.html index 09314fd826..08ae71920f 100644 --- a/templates/macros/article.html +++ b/templates/macros/article.html @@ -1,23 +1,15 @@ -{% from "macros/translation.html" import transbag %} - {% macro render_article_index(article) %} - {% set t_click_here_article = transbag('translate', article.alt, 'click_here_full_article') %} - {% set t_by = transbag('translate', article.alt, 'by').strip() %} - {% set t_published = transbag('translate', article.alt, 'published') %} - {% set t_space_after_by = transbag('translate', article.alt, 'space_after_by').strip() %} -

{{ article.title }}

- {{ t_by }}{% if t_space_after_by != 'false' %} {% endif %}{{ article.author }}; - {{ t_published }} {{ article.pub_date.strftime('%-d %B %Y') }} + {{ "by"|trans }}{% if "space_after_by"|trans != 'false' %} {% endif %}{{ article.author }}; + {{ "published"|trans }} {{ article.pub_date.strftime('%-d %B %Y') }}

{{ article.description }}

-
{{ t_click_here_article }}
+
{{ "click_here_full_article"|trans }}
{% endmacro %} {% macro render_article(article) %} - {% set t_click_here_article = transbag('translate', article.alt, 'click_here_full_article') %} {{ article.description }} -
{{ t_click_here_article }}
+
{{ "click_here_full_article"|trans }}
{% endmacro %} diff --git a/templates/macros/badge.html b/templates/macros/badge.html index b17f69445c..8859beddd2 100644 --- a/templates/macros/badge.html +++ b/templates/macros/badge.html @@ -1,12 +1,11 @@ -{% from "macros/translation.html" import transbag %} +{% macro badge(name, value) %} -{% macro badge(type, name, alt) %} - -{% if name is string %} -
{{ type }}:
{{ transbag('labels', alt, name) }}
+{% if value is string %} +
{{ name|trans }}:
{{ value|trans("labels") }}
{% else %} -
{{ type }}:
{% for n in name %}{% if loop.index != 1 %}, {% endif %} {{ transbag('labels', alt, n)|trim }}{% endfor %}
+{%- set comma = joiner() %} +
{{ name|trans }}:
{% for v in value %}{{ comma() }}{{ v|trans("labels") }}{% endfor %}
{% endif %} - +{##} {% endmacro %} diff --git a/templates/macros/blog.html b/templates/macros/blog.html index b98652b8f7..5d72fd1f68 100644 --- a/templates/macros/blog.html +++ b/templates/macros/blog.html @@ -1,15 +1,8 @@ -{% from "macros/translation.html" import transbag %} - {% macro render_blog_post(post, from_index=false) %} - - {% set t_posted_by = transbag('translate', post.alt, 'posted_by') %} - {% set t_on = transbag('translate', post.alt, 'on') %} - {% set t_post_posted_date = transbag('translate', post.alt, 'post_posted_date') %} - {% if from_index %}

{{ post.title }}

- {{ t_posted_by }} + {{ "posted_by"|trans }} {% if post.mastodon_handle %} {{ post.author or post.mastodon_handle }} {% elif post.twitter_handle %} @@ -17,7 +10,7 @@

{{ post.title }}

{% else %} {{ post.author }} {% endif %} - {{ t_on }} {{ post.pub_date.strftime('%-d %B %Y') }} {{ t_post_posted_date }} + {{ "on"|trans }} {{ post.pub_date.strftime('%-d %B %Y') }} {{ "post_posted_date"|trans }}

{% endif %} {{ post.body }} diff --git a/templates/macros/breadcrumbs.html b/templates/macros/breadcrumbs.html index 19505bd540..229bbcbe2f 100644 --- a/templates/macros/breadcrumbs.html +++ b/templates/macros/breadcrumbs.html @@ -1,10 +1,6 @@ -{% from "macros/translation.html" import transbag %} - {% macro breadcrumbs(page) %} - {% set t_home = transbag('translate', page.alt, 'home') %} - {% if not page.parent.parent %} - {{ t_home }} + {{ "home"|trans}} {% else %} {{ breadcrumbs(page.parent) }} > {{ page.parent.title }} diff --git a/templates/macros/incomplete.html b/templates/macros/incomplete.html index 1d5802b3f4..a3b56b5f97 100644 --- a/templates/macros/incomplete.html +++ b/templates/macros/incomplete.html @@ -1,16 +1,11 @@ -{% from "macros/translation.html" import transbag %} - {% macro incomplete(page) %} {% if page.incomplete %} - {% set t_text = transbag('translate', page.alt, 'incomplete_text').strip() %} - {% set t_link = transbag('translate', page.alt, 'incomplete_link').strip() %} - {% set t_after = transbag('translate', page.alt, 'incomplete_after_link_text').strip() %} - {% set space_before_link = transbag('translate', page.alt, 'incomplete_space_before_link').strip() %} - {% set space_after_link = transbag('translate', page.alt, 'incomplete_space_after_link').strip() %} -

- {{ t_text }}{% if space_before_link == 'true' %} {% endif %}{{ t_link }}{% if space_after_link == 'true' %} {% endif %}{{ t_after }} + {{ "incomplete_text"|trans }}{% if "incomplete_space_before_link"|trans == "true" %} {% endif %} + + {{ "incomplete_link"|trans }} + {% if "incomplete_space_after_link"|trans == "true" %} {% endif %}{{ "incomplete_after_link_text"|trans }}

{% endif %} {% endmacro %} diff --git a/templates/macros/join_and.html b/templates/macros/join_and.html index 1f28e582f1..3a67474c91 100644 --- a/templates/macros/join_and.html +++ b/templates/macros/join_and.html @@ -1,4 +1,4 @@ -{% macro join_and(items, join_word="and") %}{% +{% macro join_and(items, join_word="and") %}{% set join_word = join_word|trans %}{% if items|length == 1 %}{{ items[0] diff --git a/templates/macros/member-badge.html b/templates/macros/member-badge.html index b771f74f5c..3000a3e30c 100644 --- a/templates/macros/member-badge.html +++ b/templates/macros/member-badge.html @@ -1,8 +1,4 @@ -{% from "macros/translation.html" import transbag %} - {% macro member_badge(member) %} - {% set t_superpower = transbag('translate', member.alt, 'superpower')|trim %} -  {{ member.github_handle }} {% if member.mastodon_handle %} @@ -18,9 +14,10 @@ {% if member.superpower %}
{% if member.superpower is string %} - {{ t_superpower }}: {{ transbag('labels', meber.alt, member.superpower) }} + {{ "superpower"|trans }}: {{ member.superpower|trans("labels") }} {% else %} - {{ t_superpower }}: {% for s in member.superpower %}{% if loop.index != 1 %}, {% endif %} {{ transbag('labels', member.alt, s)|trim }}{% endfor %} + {%- set comma = joiner() -%} + {{ "superpower"|trans }}: {% for s in member.superpower %}{{ comma() }}{{ s|trans("labels") }}{% endfor %} {% endif %} {% endif %} {% endmacro %} diff --git a/templates/macros/membership.html b/templates/macros/membership.html index 2eb0d1e678..0ebe640228 100644 --- a/templates/macros/membership.html +++ b/templates/macros/membership.html @@ -1,6 +1,3 @@ -{% from "macros/translation.html" import transbag %} - {% macro membership_level(member) %} -{% set t_member = transbag('translate', member.alt, 'member')|trim %} -{{ transbag('labels', member.alt, member.level) }} {{ t_member|capitalize }} +{{ member.level|trans("labels") }} {{ "member"|trans|capitalize }} {% endmacro %} diff --git a/templates/macros/pagination.html b/templates/macros/pagination.html index 84a1939f14..110d166ad1 100644 --- a/templates/macros/pagination.html +++ b/templates/macros/pagination.html @@ -1,20 +1,15 @@ -{% from "macros/translation.html" import transbag %} - {% macro render_pagination(pagination, alt) %} - {% set t_previous = transbag('translate', alt, 'previous') %} - {% set t_next = transbag('translate', alt, 'next') %} - - diff --git a/templates/projects.html b/templates/projects.html index 6ad93f7e8c..a19096806f 100644 --- a/templates/projects.html +++ b/templates/projects.html @@ -1,5 +1,5 @@ {% extends "page.html" %} -{% from "macros/breadcrumbs.html" import breadcrumbs %} +{% from "macros/breadcrumbs.html" import breadcrumbs with context %} {% block title %}{{ this.title }}{% endblock %} {% block preamble %} diff --git a/templates/redirect.html b/templates/redirect.html index 2cb2b314be..735467477b 100644 --- a/templates/redirect.html +++ b/templates/redirect.html @@ -1,5 +1,5 @@ {% extends "layout.html" %} -{% from "macros/breadcrumbs.html" import breadcrumbs %} +{% from "macros/breadcrumbs.html" import breadcrumbs with context %} {% block title %}Redirecting... {{ this.new_path|safe }}{% endblock %} {% block extra_head %} diff --git a/templates/resource.html b/templates/resource.html index ebe487944d..735be8e79e 100644 --- a/templates/resource.html +++ b/templates/resource.html @@ -1,15 +1,8 @@ {% extends "page.html" %} -{% from "macros/video.html" import render_video %} -{% from "macros/podcast.html" import render_podcast %} -{% from "macros/article.html" import render_article %} -{% from "macros/breadcrumbs.html" import breadcrumbs %} -{% from "macros/translation.html" import transbag %} - -{% set t_as_seen_at = transbag('translate', this.alt, 'as_seen_at') %} -{% set t_by = transbag('translate', this.alt, 'by').strip() %}} -{% set t_space_after_by = transbag('translate', this.alt, 'space_after_by').strip() %}} -{% set t_published = transbag('translate', this.alt, 'published') %} -{% set t_unknown_resource = transbag('translate', this.alt, 'unknown_resource') %} +{% from "macros/video.html" import render_video with context %} +{% from "macros/podcast.html" import render_podcast with context %} +{% from "macros/article.html" import render_article with context %} +{% from "macros/breadcrumbs.html" import breadcrumbs with context %} {% block preamble %}
@@ -31,16 +24,16 @@

{{ this.title }}

{% elif this.resource_type == 'podcast' %} {{ render_podcast(this) }} {% else %} - {{ t_unknown_resource }} + {{ "unknown_resource"|trans }} {% endif %} {% endblock %} {% block gutter %} {% if this.event_name %}
{% if this.event_url %} -

{{ t_as_seen_at }} {{ this.event_name }}

+

{{ "as_seen_at"|trans }} {{ this.event_name }}

{% else %} -

{{ t_as_seen_at }} {{ this.event_name }}

+

{{ "as_seen_at"|trans }} {{ this.event_name }}

{% endif %}
{% endif %} diff --git a/templates/resources.html b/templates/resources.html index adb9dd4769..a6312939d4 100644 --- a/templates/resources.html +++ b/templates/resources.html @@ -1,8 +1,8 @@ {% extends "page.html" %} -{% from "macros/video.html" import render_video_index %} -{% from "macros/podcast.html" import render_podcast_index %} -{% from "macros/article.html" import render_article_index %} -{% from "macros/pagination.html" import render_pagination %} +{% from "macros/video.html" import render_video_index with context %} +{% from "macros/podcast.html" import render_podcast_index with context %} +{% from "macros/article.html" import render_article_index with context %} +{% from "macros/pagination.html" import render_pagination with context %} {% block main %} {% for resource in this.pagination.items %} diff --git a/templates/sitemap.html b/templates/sitemap.html index 6c35c0dce3..7bd1ad0fc3 100644 --- a/templates/sitemap.html +++ b/templates/sitemap.html @@ -1,9 +1,6 @@ {% extends "page.html" %} -{% from "macros/translation.html" import transbag %} -{% set t_sitemap = transbag('translate', this.alt, 'sitemap') %} - -{% block title %}{{ t_sitemap }}{% endblock %} +{% block title %}{{ "sitemap"|trans }}{% endblock %} {% block body %}