diff --git a/config.toml b/config.toml
index c87255a..89bb1cd 100644
--- a/config.toml
+++ b/config.toml
@@ -29,8 +29,10 @@ source = "Source de cette page"
 readmore = "Lire la suite"
 previousPage = "Page précédente"
 nextPage = "Page suivante"
+dateFormat = "%d/%m/%Y"
 [translations.en]
 source = "Source for this page"
 readmore = "Read more"
 previousPage = "Previous page"
 nextPage = "Next page"
+dateFormat = "%m/%d/%Y"
diff --git a/templates/index.html b/templates/index.html
index 5caede0..91c08eb 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -1,5 +1,5 @@
 {% import "widgets.html" as widgets %}
-{% set lang = section.lang | default(value=page.lang) %}{% if lang == "en" %}{% set lang = false %}{% endif %}
+{% set lang = section.lang | default(value=page.lang) %}
 <!DOCTYPE html>
 <html class="no-js" lang="{{ lang | default(value="en")}}">
     <head>
@@ -14,9 +14,7 @@
         <header>
             {% set header = get_page(path="_common/header.md") %}
             {{ header.content | markdown | safe }}
-            {% if lang %}{{ widgets::menu(content="_common/menu." ~ lang ~ ".md") }}
-            {% else %}{{ widgets::menu(content="_common/menu.md") }}
-            {% endif %}
+            {{ widgets::menu(content="_common/menu.md") }}
         </header>
         <main>
         {% block main %}
@@ -28,8 +26,7 @@
         <footer>
             {% if config.extra.forge %}
             <aside class="source">
-                {% if lang %}{% set translated = trans(key="source", lang=lang) %}
-                {% else %}{% set translated = trans(key="source") %}{% endif %}
+                {% set translated = widgets::i18n(key="source") %}
                 {% 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 4519eaf..ae98da4 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="%d/%m/%Y") }}</time>{%- endif -%}
+            {%- if page.date -%}<time class="dt-published" datetime="{{ page.date }}">📅&nbsp;{{ page.date | date(format=widgets::i18n(key="dateFormat")) }}</time>{%- endif -%}
         </div>
         <div class="e-content">{{ page.content | safe }}</div>
     </article>
diff --git a/templates/section.html b/templates/section.html
index 69a9af7..a4709e6 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="%d/%m/%Y") }}</time>{%- endif -%}
+                    {%- if page.date -%}<time class="dt-published" datetime="{{ page.date }}">📅&nbsp;{{ page.date | date(format=widgets::i18n(key="dateFormat")) }}</time>{%- endif -%}
                 </div>
                 {% if page.summary %}
                 <div class="p-summary e-content">
                 {{ page.summary | markdown | safe }}
-                <a class="read-more" href="{{ page.permalink }}">--> {% if lang %}{{ trans(key="readmore", lang=lang) }}{% else %}{{ trans(key="readmore") }}{% endif %} <--</a>
+                <a class="read-more" href="{{ page.permalink }}">--> {{ widgets::i18n(key="readmore") }} <--</a>
                 </div>
                 {% else %}
                 <div class="e-content">
@@ -28,16 +28,10 @@
         {% if paginator and paginator.number_pagers > 1 %}
         <aside class="pagination">
             {% if paginator.previous %}
-                <a href="{{ paginator.previous }}">
-                    <--&nbsp;&nbsp;{% if lang %}{{ trans(key="previousPage", lang=lang) }}
-                {% else %}{{ trans(key="previousPage") }}{% endif %}
-                </a>
+                <a href="{{ paginator.previous }}"><--&nbsp;&nbsp;{{ widgets::i18n(key="previousPage") }}</a>
             {% endif %}
             {% if paginator.next %}
-                <a href="{{ paginator.next }}">
-                {% if lang %}{{ trans(key="nextPage", lang=lang) }}
-                {% else %}{{ trans(key="nextPage") }}{% endif %}&nbsp;&nbsp;-->
-                </a>
+                <a href="{{ paginator.next }}">{{ widgets::i18n(key="nextPage") }}&nbsp;&nbsp;--></a>
             {% endif %}
         </aside>
         {% endif %}
diff --git a/templates/widgets.html b/templates/widgets.html
index ebcd2e2..c6af04c 100644
--- a/templates/widgets.html
+++ b/templates/widgets.html
@@ -17,9 +17,25 @@ a submenu. A submenu is an actual list
 ######################################}
 {% macro menu(content) %}
 <nav class="nav-menu" role="navigation">
-    {%- set source = get_page(path=content) %}{% set entries = source.content | split(pat="<hr />") %}{# fetch page content and divide it with separator -#}        
+    {%- 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 %}
 </nav>
 {% endmacro menu %}
+
+{%- macro i18n(key) -%}
+{{ trans(key=key, lang=lang) }}
+{%- endmacro i18n -%}
+
+{%- macro i18n_page(page) -%}
+    {% if lang == "en" %}{{ page }}
+    {%- else -%}
+        {%- set parts = page | 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 -%}
