From 88ed7ae7b21c19b154fa10be0b75f8c2a1694007 Mon Sep 17 00:00:00 2001
From: southerntofu <southerntofu@thunix.net>
Date: Mon, 30 Mar 2020 01:50:24 +0200
Subject: [PATCH] Simpler i18n

---
 config.toml            |  2 ++
 templates/index.html   |  2 +-
 templates/page.html    |  2 +-
 templates/section.html |  8 ++++----
 templates/widgets.html | 27 +++++++++++++++------------
 5 files changed, 23 insertions(+), 18 deletions(-)

diff --git a/config.toml b/config.toml
index 89bb1cd..69192d0 100644
--- a/config.toml
+++ b/config.toml
@@ -11,6 +11,8 @@ highlight_code = false
 # Whether to build a search index to be used later on by a JavaScript library
 build_search_index = false
 
+default_language = "en"
+
 languages = [
     {code = "fr", rss = true}
 ]
diff --git a/templates/index.html b/templates/index.html
index 91c08eb..7bcbed7 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -26,7 +26,7 @@
         <footer>
             {% if config.extra.forge %}
             <aside class="source">
-                {% set translated = widgets::i18n(key="source") %}
+                {% set translated = trans(key="source", lang=lang) %}
                 {% if section %}
                 <a href="{{ config.extra.forge.browse }}content/{{ section.path }}_index.md">{{ translated }}</a>
                 {% else %}
diff --git a/templates/page.html b/templates/page.html
index ae98da4..469c889 100644
--- a/templates/page.html
+++ b/templates/page.html
@@ -7,7 +7,7 @@
         <div>
             <h1 class="p-name">{{ page.title }}</h1>
             <a class="u-url" hidden aria-hidden="true" href="{{ page.permalink }}">Permalink</a>
-            {%- if page.date -%}<time class="dt-published" datetime="{{ page.date }}">📅&nbsp;{{ page.date | date(format=widgets::i18n(key="dateFormat")) }}</time>{%- endif -%}
+            {%- if page.date -%}<time class="dt-published" datetime="{{ page.date }}">📅&nbsp;{{ page.date | date(format=trans(key="dateFormat", lang=lang)) }}</time>{%- endif -%}
         </div>
         <div class="e-content">{{ page.content | safe }}</div>
     </article>
diff --git a/templates/section.html b/templates/section.html
index a4709e6..6b58372 100644
--- a/templates/section.html
+++ b/templates/section.html
@@ -11,12 +11,12 @@
             <article>
                 <div>
                     <a class="u-url" href="{{ page.permalink }}"><h2>{{ page.title }}</h2></a>
-                    {%- if page.date -%}<time class="dt-published" datetime="{{ page.date }}">📅&nbsp;{{ page.date | date(format=widgets::i18n(key="dateFormat")) }}</time>{%- endif -%}
+                    {%- if page.date -%}<time class="dt-published" datetime="{{ page.date }}">📅&nbsp;{{ page.date | date(format=trans(key="dateFormat", lang=lang)) }}</time>{%- endif -%}
                 </div>
                 {% if page.summary %}
                 <div class="p-summary e-content">
                 {{ page.summary | markdown | safe }}
-                <a class="read-more" href="{{ page.permalink }}">--> {{ widgets::i18n(key="readmore") }} <--</a>
+                <a class="read-more" href="{{ page.permalink }}">--> {{ trans(key="readmore", lang=lang) }} <--</a>
                 </div>
                 {% else %}
                 <div class="e-content">
@@ -28,10 +28,10 @@
         {% if paginator and paginator.number_pagers > 1 %}
         <aside class="pagination">
             {% if paginator.previous %}
-                <a href="{{ paginator.previous }}"><--&nbsp;&nbsp;{{ widgets::i18n(key="previousPage") }}</a>
+                <a href="{{ paginator.previous }}"><--&nbsp;&nbsp;{{ trans(key="previousPage", lang=lang) }}</a>
             {% endif %}
             {% if paginator.next %}
-                <a href="{{ paginator.next }}">{{ widgets::i18n(key="nextPage") }}&nbsp;&nbsp;--></a>
+                <a href="{{ paginator.next }}">{{ trans(key="nextPage", lang=lang) }}&nbsp;&nbsp;--></a>
             {% endif %}
         </aside>
         {% endif %}
diff --git a/templates/widgets.html b/templates/widgets.html
index c6af04c..a6f43f8 100644
--- a/templates/widgets.html
+++ b/templates/widgets.html
@@ -17,25 +17,28 @@ a submenu. A submenu is an actual list
 ######################################}
 {% macro menu(content) %}
 <nav class="nav-menu" role="navigation">
-    {%- set source = get_page(path=self::i18n_page(page=content)) %}{% set entries = source.content | split(pat="<hr />") %}{# fetch page content and divide it with separator -#}        
-{%- for entry in entries %}
-{{ entry | trim | replace(from="<p>", to="") | replace(from="</p>", to="") | safe }}{# strip paragraph tags away for nicer markup #}
-{%- endfor %}
+    {%- set source = self::i18n_content(path=content) -%}
+    {% set entries = source | split(pat="<hr />") %}
+    {#- fetch page content and divide it with separator -#}
+    {%- for entry in entries %}
+        {{ entry | trim | replace(from="<p>", to="") | replace(from="</p>", to="") | safe }}
+        {# strip paragraph tags away for nicer markup #}
+    {%- endfor %}
 </nav>
 {% endmacro menu %}
 
-{%- macro i18n(key) -%}
-{{ trans(key=key, lang=lang) }}
-{%- endmacro i18n -%}
-
-{%- macro i18n_page(page) -%}
-    {% if lang == "en" %}{{ page }}
+{%- macro i18n_path(path) -%}
+    {% if lang == "en" %}{{ path }}
     {%- else -%}
-        {%- set parts = page | split(pat=".md") -%}
+        {%- set parts = path | split(pat=".md") -%}
         {%- for part in parts -%}
             {%- if part and not loop.first -%}.md{%- endif -%}
             {%- if not loop.last -%}{{ part }}{%- endif -%}
         {%- endfor -%}
         .{{ lang }}.md
     {%- endif -%}
-{%- endmacro i18n_page -%}
+{%- endmacro i18n_path -%}
+
+{%- macro i18n_content(path) -%}
+    {{ get_page(path=self::i18n_path(path=path)) | get(key="content") }}
+{%- endmacro i18n_content -%}