From c82f3e3d7bcbface2bf494f2e60d61163075865f Mon Sep 17 00:00:00 2001
From: erciccione <erciccione@protonmail.com>
Date: Tue, 28 Jan 2020 17:49:37 +0100
Subject: [PATCH] Remove 'langs' from language files and move them to their own
 'languages.yml' file in /_data

The list of languages doesn't need to be translated, so there is no reason to keep it in the language files. Moved to its own
file (/_data/languages.yml). Now the language dropdown parses the languages from there.
This change is also needed for the migration to Weblate (which would ask translators to translate the language names).
---
 _data/languages.yml   | 14 ++++++++++++++
 _i18n/ar.yml          | 15 ---------------
 _i18n/de.yml          | 15 ---------------
 _i18n/en.yml          | 15 ---------------
 _i18n/es.yml          | 15 ---------------
 _i18n/fr.yml          | 15 ---------------
 _i18n/it.yml          | 15 ---------------
 _i18n/nl.yml          | 15 ---------------
 _i18n/pl.yml          | 15 ---------------
 _i18n/pt-br.yml       | 15 ---------------
 _i18n/ru.yml          | 15 ---------------
 _i18n/tr.yml          | 15 ---------------
 _i18n/zh-cn.yml       | 15 ---------------
 _i18n/zh-tw.yml       | 15 ---------------
 _includes/header.html | 31 ++++++++-----------------------
 15 files changed, 22 insertions(+), 218 deletions(-)
 create mode 100644 _data/languages.yml

diff --git a/_data/languages.yml b/_data/languages.yml
new file mode 100644
index 00000000..6c65851e
--- /dev/null
+++ b/_data/languages.yml
@@ -0,0 +1,14 @@
+langs:
+  en: English
+  es: Español
+  it: Italiano
+  pl: Polski
+  fr: Français
+  ar: العربية
+  ru: Русский
+  de: Deutsch
+  nl: Nederlands
+  pt-br: Português do Brasil
+  tr: Türkçe
+  zh-cn: 简体中文
+  zh-tw: 繁體中文 臺灣
diff --git a/_i18n/ar.yml b/_i18n/ar.yml
index 63668a79..dd77c6b5 100644
--- a/_i18n/ar.yml
+++ b/_i18n/ar.yml
@@ -1,18 +1,3 @@
-langs:
-  en: English
-  es: Español
-  it: Italiano
-  pl: Polski
-  fr: Français
-  ar: Arabic
-  ru: Русский
-  de: Deutsch
-  nl: Nederlands
-  pt-br: Português do Brasil
-  tr: Türkçe
-  zh-cn: 简体中文
-  zh-tw: 繁體中文 臺灣
-
 global:
   date: '%Y/%m/%d'
   monero: مونيرو
diff --git a/_i18n/de.yml b/_i18n/de.yml
index e6a3c19c..f444abb6 100644
--- a/_i18n/de.yml
+++ b/_i18n/de.yml
@@ -1,18 +1,3 @@
-langs:
-  en: English
-  es: Español
-  it: Italiano
-  pl: Polski
-  fr: Français
-  ar: العربية
-  ru: Русский
-  de: Deutsch
-  nl: Nederlands
-  pt-br: Português do Brasil
-  tr: Türkçe
-  zh-cn: 简体中文
-  zh-tw: 繁體中文 臺灣
-
 global:
   date: '%Y/%m/%d'
   monero: Monero
diff --git a/_i18n/en.yml b/_i18n/en.yml
index 5645de56..b4610a67 100644
--- a/_i18n/en.yml
+++ b/_i18n/en.yml
@@ -1,18 +1,3 @@
-langs:
-  en: English
-  es: Español
-  it: Italiano
-  pl: Polski
-  fr: Français
-  ar: العربية
-  ru: Русский
-  de: Deutsch
-  nl: Nederlands
-  pt-br: Português do Brasil
-  tr: Türkçe
-  zh-cn: 简体中文
-  zh-tw: 繁體中文 臺灣
-
 global:
   date: '%Y/%m/%d'
   monero: Monero
diff --git a/_i18n/es.yml b/_i18n/es.yml
index 23c663ce..d18d0cd4 100644
--- a/_i18n/es.yml
+++ b/_i18n/es.yml
@@ -1,18 +1,3 @@
-langs:
-  en: English
-  es: Español
-  it: Italiano
-  pl: Polski
-  fr: Français
-  ar: العربية
-  ru: Русский
-  de: Deutsch
-  nl: Nederlands
-  pt-br: Português do Brasil
-  tr: Türkçe
-  zh-cn: 简体中文
-  zh-tw: 繁體中文 臺灣
-
 global:
   date: '%d/%m/%Y'
   monero: Monero
diff --git a/_i18n/fr.yml b/_i18n/fr.yml
index 4d870095..0d144813 100644
--- a/_i18n/fr.yml
+++ b/_i18n/fr.yml
@@ -1,18 +1,3 @@
-langs:
-  en: English
-  es: Español
-  it: Italiano
-  pl: Polski
-  fr: Français
-  ar: العربية
-  ru: Русский
-  de: Deutsch
-  nl: Nederlands
-  pt-br: Português do Brasil
-  tr: Türkçe
-  zh-cn: 简体中文
-  zh-tw: 繁體中文 臺灣
-
 global:
   date: '%d/%m/%Y'
   monero: Monero
diff --git a/_i18n/it.yml b/_i18n/it.yml
index 539cc360..cade0c33 100644
--- a/_i18n/it.yml
+++ b/_i18n/it.yml
@@ -1,18 +1,3 @@
-langs:
-  en: English
-  es: Español
-  it: Italiano
-  pl: Polski
-  fr: Français
-  ar: العربية
-  ru: Русский
-  de: Deutsch
-  nl: Nederlands
-  pt-br: Português do Brasil
-  tr: Türkçe
-  zh-cn: 简体中文
-  zh-tw: 繁體中文 臺灣
-
 global:
   date: '%Y/%m/%d'
   monero: Monero
diff --git a/_i18n/nl.yml b/_i18n/nl.yml
index 96af40f8..66b6198e 100644
--- a/_i18n/nl.yml
+++ b/_i18n/nl.yml
@@ -1,18 +1,3 @@
-langs:
-  en: English
-  es: Español
-  it: Italiano
-  pl: Polski
-  fr: Français
-  ar: العربية
-  ru: Русский
-  de: Deutsch
-  nl: Nederlands
-  pt-br: Português do Brasil
-  tr: Türkçe
-  zh-cn: 简体中文
-  zh-tw: 繁體中文 臺灣
-
 global:
   date: '%Y/%m/%d'
   monero: Monero
diff --git a/_i18n/pl.yml b/_i18n/pl.yml
index 04cc7ef8..6449b796 100644
--- a/_i18n/pl.yml
+++ b/_i18n/pl.yml
@@ -1,18 +1,3 @@
-langs:
-  en: English
-  es: Español
-  it: Italian
-  pl: Polski
-  fr: Français
-  ar: العربية
-  ru: Русский
-  de: Deutsch
-  nl: Nederlands
-  pt-br: Português do Brasil
-  tr: Türkçe
-  zh-cn: 简体中文
-  zh-tw: 繁體中文 臺灣
-
 global:
   date: '%Y/%m/%d'
   monero: Monero
diff --git a/_i18n/pt-br.yml b/_i18n/pt-br.yml
index cd3b0faf..db4141fe 100644
--- a/_i18n/pt-br.yml
+++ b/_i18n/pt-br.yml
@@ -1,18 +1,3 @@
-langs:
-  en: English
-  es: Español
-  it: Italiano
-  pl: Polski
-  fr: Français
-  ar: العربية
-  ru: Русский
-  de: Deutsch
-  nl: Nederlands
-  pt-br: Português do Brasil
-  tr: Türkçe
-  zh-cn: 简体中文
-  zh-tw: 繁體中文 臺灣
-
 global:
   date: '%Y/%m/%d'
   monero: Monero
diff --git a/_i18n/ru.yml b/_i18n/ru.yml
index 937ee62b..3196454a 100644
--- a/_i18n/ru.yml
+++ b/_i18n/ru.yml
@@ -1,18 +1,3 @@
-langs:
-  en: English
-  es: Español
-  it: Italiano
-  pl: Polski
-  fr: Français
-  ar: العربية
-  ru: Русский
-  de: Deutsch
-  nl: Nederlands
-  pt-br: Português do Brasil
-  tr: Türkçe
-  zh-cn: 简体中文
-  zh-tw: 繁體中文 臺灣
-
 global:
   date: '%Y/%m/%d'
   monero: Monero
diff --git a/_i18n/tr.yml b/_i18n/tr.yml
index a377bc17..129f8d06 100644
--- a/_i18n/tr.yml
+++ b/_i18n/tr.yml
@@ -1,18 +1,3 @@
-langs:
-  en: English
-  es: Español
-  it: Italiano
-  pl: Polski
-  fr: Français
-  ar: العربية
-  ru: Русский
-  de: Deutsch
-  nl: Nederlands
-  pt-br: Português do Brasil
-  tr: Türkçe
-  zh-cn: 简体中文
-  zh-tw: 繁體中文 臺灣
-
 global:
   date: '%Y/%m/%d'
   monero: Monero
diff --git a/_i18n/zh-cn.yml b/_i18n/zh-cn.yml
index 33690748..0a101021 100644
--- a/_i18n/zh-cn.yml
+++ b/_i18n/zh-cn.yml
@@ -1,18 +1,3 @@
-langs:
-  en: English
-  es: Español
-  it: Italiano
-  pl: Polski
-  fr: Français
-  ar: العربية
-  ru: Русский
-  de: Deutsch
-  nl: Nederlands
-  pt-br: Português do Brasil
-  tr: Türkçe
-  zh-cn: 简体中文
-  zh-tw: 繁體中文 臺灣
-
 global:
   date: '%Y/%m/%d'
   monero: Monero
diff --git a/_i18n/zh-tw.yml b/_i18n/zh-tw.yml
index 89cb8cc9..3e80ed7b 100644
--- a/_i18n/zh-tw.yml
+++ b/_i18n/zh-tw.yml
@@ -1,18 +1,3 @@
-langs:
-  en: English
-  es: Español
-  it: Italiano
-  pl: Polski
-  fr: Français
-  ar: العربية
-  ru: Русский
-  de: Deutsch
-  nl: Nederlands
-  pt-br: Português do Brasil
-  tr: Türkçe
-  zh-cn: 简体中文
-  zh-tw: 繁體中文 臺灣
-
 global:
   date: '%Y/%m/%d'
   monero: 門羅幣
diff --git a/_includes/header.html b/_includes/header.html
index 6a3dafd6..77fc3455 100644
--- a/_includes/header.html
+++ b/_includes/header.html
@@ -71,22 +71,15 @@
                           <a href="{{site.baseurl}}/the-monero-project/" class="top-link">The Monero Project</a>
                           <div href="#" class="dropdown top-link language-change">
                             <input class="burger-checkdropdown" id="langdrop" type="checkbox">
-                            <label for="langdrop">{% for lang in site.languages %}
-                            
-                                {% if lang == site.lang %}
-                            
-                                    {% t langs.{{ lang }} %}
-                            
-                                {%endif%}
-                            
-                            {%endfor%}<div class="arrow-down"></div></label>
+                            <label for="langdrop">{{ site.data.languages.langs.[site.lang] }}
+                           <div class="arrow-down"></div></label>
                             <div class="dropdown-content text-center">
-                                    {% for lang in site.languages %}
+                              {% for lang in site.languages %}
                                 {% unless site.lang == lang %}
                                   {% if lang == site.default_lang %}
-                                    <a href="{{ site.baseurl_root }}{{ page.url }}" >{% t langs.{{ lang }} %}</a>
+                                    <a href="{{ site.baseurl_root }}{{ page.url }}" >{{ site.data.languages.langs.[lang] }}</a>
                                   {% else %}
-                                    <a href="{{ site.baseurl_root }}/{{ lang }}{{ page.url }}" >{% t langs.{{ lang }} %}</a>
+                                    <a href="{{ site.baseurl_root }}/{{ lang }}{{ page.url }}" >{{ site.data.languages.langs.[lang] }}</a>
                                   {% endif %}
                                 {% endunless %}
                               {% endfor %}
@@ -136,21 +129,13 @@
                 <input class="burger-checkdropdown" id="moblangdrop" type="checkbox">
                  <label for="moblangdrop"><img src="/img/language.png" alt="Lang" class="icon-language"/><div class="arrow-down"></div></label>
                                <div class="mob dropdown-content text-center">
-                               <p class="mob-lang-change mob-lang-selected">
-                                   
-                              {% for lang in site.languages %}
-                                {% if site.lang == lang %}
-                                 {% t langs.{{ lang }} %}
-                                {% endif %}
-                              {% endfor %}
-                                   
-                               </p>
+                               <p class="mob-lang-change mob-lang-selected">{{ site.data.languages.langs.[site.lang] }}</p>
                                {% for lang in site.languages %}
                                 {% unless site.lang == lang %}
                                   {% if lang == site.default_lang %}
-                                    <a class="mob-lang-change" href="{{ site.baseurl_root }}{{ page.url }}" >{% t langs.{{ lang }} %}</a>
+                                    <a class="mob-lang-change" href="{{ site.baseurl_root }}{{ page.url }}" >{{ site.data.languages.langs.[lang] }}</a>
                                   {% else %}
-                                    <a class="mob-lang-change" href="{{ site.baseurl_root }}/{{ lang }}{{ page.url }}" >{% t langs.{{ lang }} %}</a>
+                                    <a class="mob-lang-change" href="{{ site.baseurl_root }}/{{ lang }}{{ page.url }}" >{{ site.data.languages.langs.[lang] }}</a>
                                   {% endif %}
                                 {% endunless %}
                               {% endfor %}