Refactored template localization

2024-11-28 01:10:58 +01:00 · 2020-03-04 22:06:05 +01:00 · 2020-03-04 22:06:05 +01:00 · 3242ca974e
commit 3242ca974e
parent 66376bbe8c
16 changed files with 10 additions and 25 deletions
--- a/src/base.html
+++ b/src/base.html
@ -169,16 +169,17 @@
  </head>

  <!-- Text direction and color palette, if defined -->
+  {% set direction = config.theme.direction | default(lang.t('direction')) %}
  {% if palette.primary or palette.accent %}
    {% set primary = palette.primary | replace(" ", "-") | lower %}
    {% set accent  = palette.accent  | replace(" ", "-") | lower %}
    <body
-      dir="{{ lang.t('direction') }}"
+      dir="{{ direction }}"
      data-md-color-primary="{{ primary }}"
      data-md-color-accent="{{ accent }}"
    >
  {% else %}
-    <body dir="{{ lang.t('direction') }}">
+    <body dir="{{ direction }}">
  {% endif %}

    <!--
@ -380,8 +381,7 @@
        "clipboard.copy",
        "clipboard.copied",
        "search.language",
-        "search.pipeline.stopwords",
-        "search.pipeline.trimmer",
+        "search.pipeline",
        "search.result.placeholder",
        "search.result.none",
        "search.result.one",
--- a/src/partials/language.html
+++ b/src/partials/language.html
@ -27,6 +27,4 @@
 {% import "partials/language/en.html" as fallback %}

 <!-- Re-export translations -->
-{% macro t(key) %}{{ {
-  "direction": config.theme.direction
-}[key] or lang.t(key) or fallback.t(key) }}{% endmacro %}
+{% macro t(key) %}{{ lang.t(key) | default(fallback.t(key)) }}{% endmacro %}
--- a/src/partials/language/ar.html
+++ b/src/partials/language/ar.html
@ -31,7 +31,6 @@
  "footer.next": "التالية",
  "meta.comments": "التعليقات",
  "meta.source": "المصدر",
-  "search.language": "",
  "search.pipeline": "",
  "search.placeholder": "بحث",
  "search.result.placeholder": "اكتب لبدء البحث",
--- a/src/partials/language/ca.html
+++ b/src/partials/language/ca.html
@ -30,7 +30,6 @@
  "footer.next": "Següent",
  "meta.comments": "Comentaris",
  "meta.source": "Codi font",
-  "search.language": "",
  "search.placeholder": "Cerca",
  "search.result.placeholder": "Escriu per a començar a cercar",
  "search.result.none": "Cap document coincideix",
--- a/src/partials/language/et.html
+++ b/src/partials/language/et.html
@ -30,7 +30,6 @@
  "footer.next": "Järgmine",
  "meta.comments": "Kommentaarid",
  "meta.source": "Lähtekood",
-  "search.language": "",
  "search.pipeline": "",
  "search.placeholder": "Otsi",
  "search.result.placeholder": "Otsimiseks kirjuta siia",
--- a/src/partials/language/fa.html
+++ b/src/partials/language/fa.html
@ -31,7 +31,6 @@
  "footer.next": "بعدی",
  "meta.comments": "نظرات",
  "meta.source": "منبع",
-  "search.language": "",
  "search.pipeline": "",
  "search.placeholder": "جستجو",
  "search.result.placeholder": "برای شروع جستجو تایپ کنید",
--- a/src/partials/language/gr.html
+++ b/src/partials/language/gr.html
@ -30,7 +30,6 @@
  "footer.next": "Προηγούμενη",
  "meta.comments": "Σχόλια",
  "meta.source": "Πηγή",
-  "search.language": "",
  "search.pipeline": "",
  "search.placeholder": "Αναζήτηση",
  "search.result.placeholder": "Πληκτρολογήστε για να αρχίσει η αναζήτηση",
--- a/src/partials/language/he.html
+++ b/src/partials/language/he.html
@ -31,7 +31,6 @@
  "footer.next": "הַבָּא",
  "meta.comments": "הערות",
  "meta.source": "מָקוֹר",
-  "search.language": "",
  "search.pipeline": "",
  "search.placeholder": "לחפש",
  "search.result.placeholder": "הקלד כדי להתחיל לחפש",
--- a/src/partials/language/hi.html
+++ b/src/partials/language/hi.html
@ -30,7 +30,6 @@
  "footer.next": "आगामी",
  "meta.comments": "टिप्पणियाँ",
  "meta.source": "स्रोत",
-  "search.language": "",
  "search.pipeline": "",
  "search.placeholder": "खोज",
  "search.result.placeholder": "खोज शुरू करने के लिए टाइप करें",
--- a/src/partials/language/hr.html
+++ b/src/partials/language/hr.html
@ -30,7 +30,6 @@
  "footer.next": "Sljedeće",
  "meta.comments": "Komentari",
  "meta.source": "Izvor",
-  "search.language": "",
  "search.pipeline": "",
  "search.placeholder": "Pretraživanje",
  "search.result.placeholder": "Unesite pojam pretraživanja",
--- a/src/partials/language/id.html
+++ b/src/partials/language/id.html
@ -30,7 +30,6 @@
  "footer.next": "Selanjutnya",
  "meta.comments": "Komentar",
  "meta.source": "Sumber",
-  "search.language": "",
  "search.pipeline": "",
  "search.placeholder": "Cari",
  "search.result.placeholder": "Ketik untuk mulai pencarian",
--- a/src/partials/language/pl.html
+++ b/src/partials/language/pl.html
@ -30,7 +30,6 @@
  "footer.next": "Następna strona",
  "meta.comments": "Komentarze",
  "meta.source": "Kod źródłowy",
-  "search.language": "",
  "search.pipeline": "",
  "search.placeholder": "Szukaj",
  "search.result.placeholder": "Zacznij pisać, aby szukać",
--- a/src/partials/language/si.html
+++ b/src/partials/language/si.html
@ -30,7 +30,6 @@
  "footer.next": "Naslednja stran",
  "meta.comments": "Komentarji",
  "meta.source": "Izvorna koda",
-  "search.language": "",
  "search.placeholder": "Išči",
  "search.result.placeholder": "Vpiši iskalni niz",
  "search.result.none": "Ni zadetkov",
--- a/src/partials/language/sk.html
+++ b/src/partials/language/sk.html
@ -30,7 +30,6 @@
  "footer.next": "Ďalej",
  "meta.comments": "Komentáre",
  "meta.source": "Zdroj",
-  "search.language": "",
  "search.placeholder": "Hľadať",
  "search.result.placeholder": "Pre vyhľadávanie začni písať",
  "search.result.none": "Žiadne vyhovujúce dokumenty",
--- a/src/partials/language/sr.html
+++ b/src/partials/language/sr.html
@ -30,7 +30,6 @@
  "footer.next": "Следеће",
  "meta.comments": "Коментари",
  "meta.source": "Извор",
-  "search.language": "",
  "search.pipeline": "",
  "search.placeholder": "Претрага",
  "search.result.placeholder": "Унесите појам претраге",
--- a/src/partials/toc.html
+++ b/src/partials/toc.html
@ -24,7 +24,7 @@

 <!-- Table of contents -->
 <nav class="md-nav md-nav--secondary">
-  {% set toc_ = page.toc %}
+  {% set toc = page.toc %}

  <!--
    Hack: check whether the content contains a h1 headline. If it does, the
@ -32,12 +32,12 @@
    to the current page that is located just above the anchor. Therefore we
    directly continue with the children of the anchor.
  -->
-  {% if toc_ | first is defined and "\x3ch1 id=" in page.content %}
-    {% set toc_ = (toc_ | first).children %}
+  {% if toc | first is defined and "\x3ch1 id=" in page.content %}
+    {% set toc = (toc | first).children %}
  {% endif %}

  <!-- Render item list -->
-  {% if toc_ | first is defined %}
+  {% if toc | first is defined %}
    <label class="md-nav__title" for="__toc">
      <span class="md-nav__icon md-icon">
        {% include ".icons/material/arrow-left.svg" %}
@ -45,7 +45,7 @@
      {{ lang.t("toc.title") }}
    </label>
    <ul class="md-nav__list" data-md-scrollfix>
-      {% for toc_item in toc_ %}
+      {% for toc_item in toc %}
        {% include "partials/toc-item.html" %}
      {% endfor %}
    </ul>