From 6c3c65c44a2d3079c5f78df16b65f02c866ad826 Mon Sep 17 00:00:00 2001
From: Saivann <saivann@gmail.com>
Date: Mon, 29 Apr 2013 22:50:22 -0400
Subject: [PATCH] Fix language menu order in older jekyll versions

---
 _config.yml           | 6 ++++++
 _contrib/translate    | 3 +++
 _layouts/base-en.html | 8 ++++----
 _layouts/base-es.html | 8 ++++----
 _layouts/base-fr.html | 8 ++++----
 _layouts/base-nl.html | 8 ++++----
 6 files changed, 25 insertions(+), 16 deletions(-)

diff --git a/_config.yml b/_config.yml
index a5327969..8e239f1b 100644
--- a/_config.yml
+++ b/_config.yml
@@ -2,6 +2,12 @@ DOWNLOAD_VERSION: 0.8.1
 ALERT_CLASS: 
 ALERT: 
 
+langsorder:
+- id: en
+- id: es
+- id: fr
+- id: nl
+
 langs:
   en: English
   es: Español
diff --git a/_contrib/translate b/_contrib/translate
index 58cf0174..deeb8971 100755
--- a/_contrib/translate
+++ b/_contrib/translate
@@ -15,3 +15,6 @@ sed -i "s/ALERT_en/ALERT_${1}/g" _layouts/base-${1}.html
 sed -i "/${1}: ${2}/d" _config.yml
 sed -i "/langs:/a - ${1}: ${2}" _config.yml
 sed -i "s_- ${1}: ${2}_  ${1}: ${2}_g" _config.yml
+sed -i "/- id: ${1}/d" _config.yml
+sed -i "/langsorder:/a- id: ${1}" _config.yml
+sed -i "s_- id:${1}_- id: ${1}_g" _config.yml
diff --git a/_layouts/base-en.html b/_layouts/base-en.html
index 37b9ca3a..b55a6f2a 100644
--- a/_layouts/base-en.html
+++ b/_layouts/base-en.html
@@ -54,15 +54,15 @@ footer: © Bitcoin Project 2009–2013 Released under the <a href="http://creati
 {% endif %}
   <div id="head"><div>
     <select id="langselect" onchange="window.location=this.value;">
-      {% for lang in site.langs %}{% assign la = lang[0]%}{% if lang[0] == page.lang %}{% assign active = ' selected="selected"'%}{% else %}{% assign active = ''%}{% endif %}
-      <option value="/{{ lang[0] }}/{{ site.section[page.id][la] }}"{{ active }}>{{ lang[1] }}</option>
+      {% for lang in site.langsorder %}{% if lang.id == page.lang %}{% assign active = ' selected="selected"'%}{% else %}{% assign active = ''%}{% endif %}
+      <option value="/{{ lang.id }}/{{ site.section[page.id][lang.id] }}"{{ active }}>{{ site.langs[lang.id] }}</option>
       {% endfor %}
     </select>
     <ul id="lang">
       <li><a href="#" onclick="return false;">{{ site.langs[page.lang] }}</a>
       <ul>
-        {% for lang in site.langs %}{% if lang[0] != page.lang %}{% assign la = lang[0]%}
-        <li><a href="/{{ lang[0] }}/{{ site.section[page.id][la] }}">{{ lang[1] }}</a></li>
+        {% for lang in site.langsorder %}{% if lang.id != page.lang %}
+        <li><a href="/{{ lang.id }}/{{ site.section[page.id][lang.id] }}">{{ site.langs[lang.id] }}</a></li>
         {% endif %}{% endfor %}
       </ul>
       </li>
diff --git a/_layouts/base-es.html b/_layouts/base-es.html
index 39f392c6..a4af27a6 100644
--- a/_layouts/base-es.html
+++ b/_layouts/base-es.html
@@ -52,15 +52,15 @@ footer: © Bitcoin Project 2009–2013 Publicado bajo la <a href="http://creativ
 {% endif %}
   <div id="head"><div>
     <select id="langselect" onchange="window.location=this.value;">
-      {% for lang in site.langs %}{% assign la = lang[0]%}{% if lang[0] == page.lang %}{% assign active = ' selected="selected"'%}{% else %}{% assign active = ''%}{% endif %}
-      <option value="/{{ lang[0] }}/{{ site.section[page.id][la] }}"{{ active }}>{{ lang[1] }}</option>
+      {% for lang in site.langsorder %}{% if lang.id == page.lang %}{% assign active = ' selected="selected"'%}{% else %}{% assign active = ''%}{% endif %}
+      <option value="/{{ lang.id }}/{{ site.section[page.id][lang.id] }}"{{ active }}>{{ site.langs[lang.id] }}</option>
       {% endfor %}
     </select>
     <ul id="lang">
       <li><a href="#" onclick="return false;">{{ site.langs[page.lang] }}</a>
       <ul>
-        {% for lang in site.langs %}{% if lang[0] != page.lang %}{% assign la = lang[0]%}
-        <li><a href="/{{ lang[0] }}/{{ site.section[page.id][la] }}">{{ lang[1] }}</a></li>
+        {% for lang in site.langsorder %}{% if lang.id != page.lang %}
+        <li><a href="/{{ lang.id }}/{{ site.section[page.id][lang.id] }}">{{ site.langs[lang.id] }}</a></li>
         {% endif %}{% endfor %}
       </ul>
       </li>
diff --git a/_layouts/base-fr.html b/_layouts/base-fr.html
index 54258f3f..5015072a 100644
--- a/_layouts/base-fr.html
+++ b/_layouts/base-fr.html
@@ -52,15 +52,15 @@ footer: © Bitcoin Project 2009–2013 Publié sous la <a href="http://creativec
 {% endif %}
   <div id="head"><div>
     <select id="langselect" onchange="window.location=this.value;">
-      {% for lang in site.langs %}{% assign la = lang[0]%}{% if lang[0] == page.lang %}{% assign active = ' selected="selected"'%}{% else %}{% assign active = ''%}{% endif %}
-      <option value="/{{ lang[0] }}/{{ site.section[page.id][la] }}"{{ active }}>{{ lang[1] }}</option>
+      {% for lang in site.langsorder %}{% if lang.id == page.lang %}{% assign active = ' selected="selected"'%}{% else %}{% assign active = ''%}{% endif %}
+      <option value="/{{ lang.id }}/{{ site.section[page.id][lang.id] }}"{{ active }}>{{ site.langs[lang.id] }}</option>
       {% endfor %}
     </select>
     <ul id="lang">
       <li><a href="#" onclick="return false;">{{ site.langs[page.lang] }}</a>
       <ul>
-        {% for lang in site.langs %}{% if lang[0] != page.lang %}{% assign la = lang[0]%}
-        <li><a href="/{{ lang[0] }}/{{ site.section[page.id][la] }}">{{ lang[1] }}</a></li>
+        {% for lang in site.langsorder %}{% if lang.id != page.lang %}
+        <li><a href="/{{ lang.id }}/{{ site.section[page.id][lang.id] }}">{{ site.langs[lang.id] }}</a></li>
         {% endif %}{% endfor %}
       </ul>
       </li>
diff --git a/_layouts/base-nl.html b/_layouts/base-nl.html
index e19e1bda..6959c997 100644
--- a/_layouts/base-nl.html
+++ b/_layouts/base-nl.html
@@ -52,15 +52,15 @@ footer: © Bitcoin Project 2009–2013 Beschikbaar onder de <a href="http://crea
 {% endif %}
   <div id="head"><div>
     <select id="langselect" onchange="window.location=this.value;">
-      {% for lang in site.langs %}{% assign la = lang[0]%}{% if lang[0] == page.lang %}{% assign active = ' selected="selected"'%}{% else %}{% assign active = ''%}{% endif %}
-      <option value="/{{ lang[0] }}/{{ site.section[page.id][la] }}"{{ active }}>{{ lang[1] }}</option>
+      {% for lang in site.langsorder %}{% if lang.id == page.lang %}{% assign active = ' selected="selected"'%}{% else %}{% assign active = ''%}{% endif %}
+      <option value="/{{ lang.id }}/{{ site.section[page.id][lang.id] }}"{{ active }}>{{ site.langs[lang.id] }}</option>
       {% endfor %}
     </select>
     <ul id="lang">
       <li><a href="#" onclick="return false;">{{ site.langs[page.lang] }}</a>
       <ul>
-        {% for lang in site.langs %}{% if lang[0] != page.lang %}{% assign la = lang[0]%}
-        <li><a href="/{{ lang[0] }}/{{ site.section[page.id][la] }}">{{ lang[1] }}</a></li>
+        {% for lang in site.langsorder %}{% if lang.id != page.lang %}
+        <li><a href="/{{ lang.id }}/{{ site.section[page.id][lang.id] }}">{{ site.langs[lang.id] }}</a></li>
         {% endif %}{% endfor %}
       </ul>
       </li>