_includes/site-header.html in jekyll-theme-simple-blog-0.0.1 vs _includes/site-header.html in jekyll-theme-simple-blog-0.0.2

@@ -1,13 +1,14 @@
 <header class="site-header" role="banner">
 
   <div class="wrapper">
-    {% assign default_paths = site.pages | map: "path" %}
+    {% assign default_paths = site.pages | where:"lang", page.lang | sort:"order" | map: "path" %}
     {% assign page_paths = site.header_pages | default: default_paths %}
 
     {% if page.layout != 'home' %}
-      <a class="site-title" href="{{ "/" | relative_url }}">{{ site.title | escape }}</a>
+      {% assign home_page_path = site.pages | where:"ref", "home" | where:"lang", page.lang | map: "url" | first %}
+      <a class="site-title" href="{{ home_page_path | prepend: site.baseurl }}">{{ site.title | escape }}</a>
     {% endif %}
 
     {% if page_paths %}
       <nav class="site-nav">
         <input type="checkbox" id="nav-trigger" class="nav-trigger" />
@@ -25,10 +26,10 @@
           {% for path in page_paths %}
             {% assign my_page = site.pages | where: "path", path | first %}
             {% if my_page.title %}
               {% if my_page.title contains "404" %}
               {% else %}
-                <a class="page-link" href="{{ my_page.url | relative_url }}">{{ my_page.title | escape }}</a>
+                <a class="page-link" href="{{ my_page.url | prepend: site.baseurl }}">{{ my_page.title | escape }}</a>
               {% endif %}
             {% endif %}
           {% endfor %}
         </div>
       </nav>