Reformated pages.yml. Changing language keeps you on same page.

_data/i18n/pages.yml

@@ -1,3 +1,68 @@
+all:
+  ee:
+    home:
+      name  : "Esileht"
+      url   : "/"
+    statute:
+      name  : "Põhikiri"
+      url   : "/statute/"
+    history:
+      name  : "Ajalugu"
+      url   : "/history/"
+    members:
+      name  : "Liikmed"
+      url   : "/members/"
+    student:
+      name: "Tudengile"
+      url:  "/student/"
+    mentors:
+      name: "Mentorid"
+      url:  "/mentors/"
+    helpdesk:
+      name: "Helpdesk"
+      url:  "/helpdesk/"
+    ourwork:
+      name: "Ettevõttele"
+      url:  "/ourwork/"
+    aboutus:
+      name: "Lapikutest"
+      url:  "/aboutus/"
+    contact:
+      name: "Kontakt"
+      url:  "/contact/"
+  en:
+    home:
+      name  : "Front page"
+      url   : "/en/"
+    statute:
+      name  : "Statute"
+      url   : "/en/statute/"
+    history:
+      name  : "History"
+      url   : "/en/history/"
+    members:
+      name  : "Members"
+      url   : "/en/members/"
+    student:
+      name: "For students"
+      url:  "/en/student/"
+    mentors:
+      name: "Mentors"
+      url:  "/en/mentors/"
+    helpdesk:
+      name: "Helpdesk"
+      url:  "/en/helpdesk/"
+    ourwork:
+      name: "For businesses"
+      url:  "/en/ourwork/"
+    aboutus:
+      name: "About us"
+      url:  "/en/aboutus/"
+    contact:
+      name: "Contact"
+      url:  "/en/contact/"
+
+# For iterating through and populating navbar
 nav:
   ee:
     student:
@@ -37,31 +102,3 @@ nav:
     contact:
       name  : "Contact"
       url   :  "/en/contact/"
-
-other:
-  ee:
-    home:
-      name  : "Esileht"
-      url   : "/"
-    statute:
-      name  : "Põhikiri"
-      url   : "/statute/"
-    history:
-      name  : "Ajalugu"
-      url   : "/history/"
-    members:
-      name  : "Liikmed"
-      url   : "/members/"
-  en:
-    home:
-      name  : "Front page"
-      url   : "/en/"
-    statute:
-      name  : "Statute"
-      url   : "/en/statute/"
-    history:
-      name  : "History"
-      url   : "/en/history/"
-    members:
-      name  : "Members"
-      url   : "/en/members/"

_includes/footer.html

@@ -1,5 +1,5 @@
 {% assign locale = site.data.i18n.footer[page.language] %}
-{% assign home = site.data.i18n.pages.other[page.language].home %}
+{% assign home = site.data.i18n.pages.all[page.language].home %}
 <footer class="main-footer">
   <section class="container">
     <div class="row">

_includes/header.html

@@ -1,7 +1,7 @@
 <!-- header.scss -->
-
+{% assign pages = site.data.i18n.pages.all %}
 <nav class="navigation">
-  <a href="{{site.data.i18n.pages.other[page.language].home.url}}" {% if page.url == '/' or page.url == '/en/' %}style="display: none;"{% endif %}>
+  <a href="{{site.data.i18n.pages.all[page.language].home.url}}" {% if page.url == '/' or page.url == '/en/' %}style="display: none;"{% endif %}>
 	<img id="header-logo" class="logo" src="{{ "/assets/logo.svg " | relative_url }}">
   </a>
 
@@ -13,11 +13,10 @@
     </a>
 
     <ul id="main-menu">
-
       {% if page.language == "ee" %}
-      <a href="{{site.data.i18n.pages.other.en.home.url}}">In English</a>
+      <a href="{{ pages.en[page.tag].url }}">In English</a>
       {% elsif page.language == "en" %}
-      <a href="{{site.data.i18n.pages.other.ee.home.url}}">Eesti keeles</a>
+      <a href="{{pages.ee[page.tag].url}}">Eesti keeles</a>
       {% endif %}
 
       {% include main_nav.html %}

_includes/pages/aboutus.html

@@ -1,5 +1,5 @@
 {% assign locale = site.data.i18n.aboutus[page.language] %}
-{% assign subpages = site.data.i18n.pages.other[page.language] %}
+{% assign subpages = site.data.i18n.pages.all[page.language] %}
 
 <div class="page">
     <h1>MTÜ Lapikud</h1>

aboutus.html

@@ -2,6 +2,7 @@
 layout: default
 title: Lapikutest - Lapikud
 language: ee
+tag: aboutus
 ---
 
 {% include pages/aboutus.html %}

contact.html

@@ -2,6 +2,7 @@
 layout: default
 title: Kontakt - Lapikud
 language: ee
-ref: contact
+tag: contact
 ---
+
 {% include pages/contact.html %}

en/aboutus.html

@@ -2,6 +2,7 @@
 layout: default
 title: About us - Lapikud
 language: en
+tag: aboutus
 ---
 
 {% include pages/aboutus.html %}

en/contact.html

@@ -2,6 +2,7 @@
 layout: default
 title: Contact - Lapikud
 language: en
-ref: contact
+tag: contact
 ---
+
 {% include pages/contact.html %}

en/helpdesk.html

@@ -2,5 +2,7 @@
 layout: default
 title: Helpdesk - Lapikud
 language: en
+tag: helpdesk
 ---
+
 {% include pages/helpdesk.html %}

en/history.html

@@ -2,7 +2,9 @@
 layout: default
 title: History - Lapikud
 language: en
+tag: history
 ---
+
 {% include pages/history.html %}
 
 

en/index.html

@@ -2,5 +2,7 @@
 layout: default
 title: Lapikud
 language: en
+tag: home
 ---
+
 {% include pages/index.html %}

en/members.html

@@ -2,5 +2,7 @@
 layout: default
 title: Members - Lapikud
 language: en
+tag: members
 ---
+
 {% include pages/members.html %}

en/mentors.html

@@ -2,5 +2,7 @@
 layout: default
 title: Mentors- Lapikud
 language: en
+tag: mentors
 ---
+
 {% include pages/mentors.html %}

en/ourwork.html

@@ -2,5 +2,7 @@
 layout: default
 title: Previous works - Lapikud
 language: en
+tag: ourwork
 ---
+
 {% include pages/ourwork.html %}

en/student.html

@@ -2,5 +2,7 @@
 layout: default
 title: For student - Lapikud
 language: en
+tag: student
 ---
+
 {% include pages/student.html %}

helpdesk.html

@@ -2,5 +2,7 @@
 layout: default
 title: Helpdesk - Lapikud
 language: ee
+tag: helpdesk
 ---
+
 {% include pages/helpdesk.html %}

history.html

@@ -2,5 +2,7 @@
 layout: default
 title: Ajalugu - Lapikud
 language: ee
+tag: history
 ---
+
 {% include pages/history.html %}

index.html

@@ -2,6 +2,8 @@
 layout: default
 title: Lapikud
 language: ee
+tag: home
 ---
+
 {% include pages/index.html %}
 

members.html

@@ -2,5 +2,7 @@
 layout: default
 title: Liikmed - Lapikud
 language: ee
+tag: members
 ---
+
 {% include pages/members.html %}

mentors.html

@@ -2,5 +2,7 @@
 layout: default
 title: Mentorid - Lapikud
 language: ee
+tag: mentors
 ---
+
 {% include pages/mentors.html%}

ourwork.html

@@ -2,5 +2,7 @@
 layout: default
 title: Tehtud tööd - Lapikud
 language: ee
+tag: ourwork
 ---
+
 {% include pages/ourwork.html %}

student.html

@@ -2,5 +2,7 @@
 layout: default
 title: Tudengile - Lapikud
 language: ee
+tag: student
 ---
+
 {% include pages/student.html %}