diff --git a/_includes/variables.html b/_includes/variables.html
index a17ca8d7..807a9eda 100644
--- a/_includes/variables.html
+++ b/_includes/variables.html
@@ -1,80 +1,83 @@
-
-{% if page.lang == nil or page.lang == "en" %}
-
- {% assign lang = "" %}
-
- {% assign includes = site.data.includes %}
-
- {% assign architecture = site.data.architecture %}
-
- {% assign doc-index = site.data.doc-index %}
-
- {% assign all_docs = site.doc %}
-
- {% assign downloads-page = site.data.downloads-page %}
-
- {% assign hcl = site.data.hcl %}
-
- {% assign experts = site.data.experts %}
-
- {% assign team-page = site.data.team-page %}
-
- {% assign style-guide-page = site.data.style-guide-page %}
-{% else %}
-
- {% assign lang = "/" | append: page.lang %}
-
- {% assign includes = site.data.translation[page.lang].includes %}
- {% if includes == nil or includes.size == 0 %}
+
+{% if architecture == nil or architecture.size == 0 %}
+
+ {% if page.lang == nil or page.lang == "en" %}
+
+ {% assign lang = "" %}
+
{% assign includes = site.data.includes %}
- {% endif %}
-
- {% assign architecture = site.data.translation[page.lang].architecture %}
- {% if architecture == nil or architecture.size == 0 %}
+
{% assign architecture = site.data.architecture %}
- {% endif %}
-
- {% assign doc-index = site.data.translation[page.lang].doc-index %}
- {% if doc-index == nil or doc-index.size == 0 %}
+
{% assign doc-index = site.data.doc-index %}
- {% endif %}
-
- {% assign all_docs = site.translated %}
-
- {% assign downloads-page = site.data.translation[page.lang].downloads-page %}
- {% if downloads-page == nil or downloads-page.size == 0 %}
+
+ {% assign all_docs = site.doc %}
+
{% assign downloads-page = site.data.downloads-page %}
- {% endif %}
-
- {% assign hcl = site.data.translation[page.lang].hcl %}
- {% if hcl == nil or hcl.size == 0 %}
+
{% assign hcl = site.data.hcl %}
- {% endif %}
-
- {% assign experts = site.data.translation[page.lang].experts %}
- {% if experts == nil or experts.size == 0 %}
+
{% assign experts = site.data.experts %}
- {% endif %}
-
- {% assign team-page = site.data.translation[page.lang].team-page %}
- {% if team-page == nil or team-page.size == 0 %}
+
{% assign team-page = site.data.team-page %}
+
+ {% assign style-guide-page = site.data.style-guide-page %}
+ {% else %}
+
+ {% assign lang = "/" | append: page.lang %}
+
+ {% assign includes = site.data.translation[page.lang].includes %}
+ {% if includes == nil or includes.size == 0 %}
+ {% assign includes = site.data.includes %}
+ {% endif %}
+
+ {% assign architecture = site.data.translation[page.lang].architecture %}
+ {% if architecture == nil or architecture.size == 0 %}
+ {% assign architecture = site.data.architecture %}
+ {% endif %}
+
+ {% assign doc-index = site.data.translation[page.lang].doc-index %}
+ {% if doc-index == nil or doc-index.size == 0 %}
+ {% assign doc-index = site.data.doc-index %}
+ {% endif %}
+
+ {% assign all_docs = site.translated %}
+
+ {% assign downloads-page = site.data.translation[page.lang].downloads-page %}
+ {% if downloads-page == nil or downloads-page.size == 0 %}
+ {% assign downloads-page = site.data.downloads-page %}
+ {% endif %}
+
+ {% assign hcl = site.data.translation[page.lang].hcl %}
+ {% if hcl == nil or hcl.size == 0 %}
+ {% assign hcl = site.data.hcl %}
+ {% endif %}
+
+ {% assign experts = site.data.translation[page.lang].experts %}
+ {% if experts == nil or experts.size == 0 %}
+ {% assign experts = site.data.experts %}
+ {% endif %}
+
+ {% assign team-page = site.data.translation[page.lang].team-page %}
+ {% if team-page == nil or team-page.size == 0 %}
+ {% assign team-page = site.data.team-page %}
+ {% endif %}
+
+ {% assign style-guide-page = site.data.translation[page.lang].style-guide-page %}
+ {% if style-guide-page == nil or style-guide-page.size == 0 %}
+ {% assign style-guide-page = site.data.hcl %}
+ {% endif %}
{% endif %}
-
- {% assign style-guide-page = site.data.translation[page.lang].style-guide-page %}
- {% if style-guide-page == nil or style-guide-page.size == 0 %}
- {% assign style-guide-page = site.data.hcl %}
+
+ {% assign doc_link = lang | append: "/doc/" %}
+
+ {% assign team_link = lang | append: "/team/" %}
+
+ {% assign news_categories_link = lang | append: "/news/categories/" %}
+ {% assign news_count = site.posts | where:'permalink', news_categories_link %}
+ {% if news_count.size == 0 %}
+ {% assign news_categories_link = "/news/categories/" %}
{% endif %}
+
+ {% assign path_segments = page.relative_path | split: '/' %}
{% endif %}
-
-{% assign doc_link = lang | append: "/doc/" %}
-
-{% assign team_link = lang | append: "/team/" %}
-
-{% assign news_categories_link = lang | append: "/news/categories/" %}
-{% assign news_count = site.posts | where:'permalink', news_categories_link %}
-{% if news_count.size == 0 %}
- {% assign news_categories_link = "/news/categories/" %}
-{% endif %}
-
-{% assign path_segments = page.relative_path | split: '/' %}