From 3f207bb73f2d07cf0b3b973df822cf7833fe1b83 Mon Sep 17 00:00:00 2001
From: TomNuorivaara-Solita <tom.nuorivaara@solita.fi>
Date: Wed, 24 Jan 2018 10:15:35 +0200
Subject: [PATCH] Frontpage news and posts news collection multilang filtering
 fixed

---
 404.html                                  |  5 ++++
 _config_dev.yml                           |  3 +++
 _includes/posts-in-category.html          | 10 +++++--
 _includes/sidebar-traffictype-filter.html | 32 +++++++++++------------
 _layouts/frontpage.html                   |  4 +--
 _layouts/posts.html                       |  2 +-
 _posts/2017-07-15-release-en.md           |  8 +++---
 _posts/2017-11-28-release-en.md           |  6 ++---
 _posts/2018-01-09-release-en.md           |  4 +--
 9 files changed, 44 insertions(+), 30 deletions(-)
 create mode 100644 404.html

diff --git a/404.html b/404.html
new file mode 100644
index 000000000..013f69cc4
--- /dev/null
+++ b/404.html
@@ -0,0 +1,5 @@
+---
+permalink: /404.html
+---
+
+<p>404 - Page not found.</p>
\ No newline at end of file
diff --git a/_config_dev.yml b/_config_dev.yml
index 7bf205821..b1a3e4a4e 100644
--- a/_config_dev.yml
+++ b/_config_dev.yml
@@ -62,6 +62,9 @@ t:
   meriliikenne:
     en: "Maritime"
     fi: "Meriliikenne"
+  kokeellinen:
+    en: "Experimental"
+    fi: "Kokeellinen"
   
   # Post types
   artikkelit:
diff --git a/_includes/posts-in-category.html b/_includes/posts-in-category.html
index 78aa88fd7..14984fc01 100644
--- a/_includes/posts-in-category.html
+++ b/_includes/posts-in-category.html
@@ -1,5 +1,11 @@
 {% assign posts = site.posts | where:"lang",page.lang %}
-{% assign posts = posts | where:"categories",include.category %}
+{% if page.lang == "en" and include.category_en %}
+  {% assign posts = posts | where:"categories",include.category_en %}
+  {% assign category = include.category_en | downcase %}
+{% else %}
+  {% assign posts = posts | where:"categories",include.category_fi" %}
+  {% assign category = include.category_fi | downcase %}
+{% endif %}
 
 {% if posts.size == 1 %}
   {% assign posts_text = include.posts-singular %}
@@ -24,7 +30,7 @@ <h3 class="h3 posts-in-category__post-heading"><a href="{{ post.url | prepend:si
       --></span><!--
       --><ul class="date-type-tags__type-list"><!--
         -->{% for traffictype in post.traffictypes %}<!--
-        --><li class="date-type-tags__type"><a class="link" href="{{ "/" | prepend:site.baseurl }}{{ category[0] | downcase }}?traffictype={{ traffictype | downcase }}">{% assign traffictype_dc = traffictype | downcase %}{{ site.t[traffictype_dc][page.lang] }}</a></li><!--
+        --><li class="date-type-tags__type"><a class="link" href="{% include url-home.html %}{{ category | downcase }}?traffictype={{ traffictype | downcase }}">{{ traffictype }}</a></li><!--
         -->{% endfor %}<!--
       --></ul><!--
       --><ul class="date-type-tags__tag-list"><!--
diff --git a/_includes/sidebar-traffictype-filter.html b/_includes/sidebar-traffictype-filter.html
index b9a7ca38c..7cbfb0799 100644
--- a/_includes/sidebar-traffictype-filter.html
+++ b/_includes/sidebar-traffictype-filter.html
@@ -13,16 +13,16 @@
         {% break %}
       {% endif %}
         {% for traffictype in post.traffictypes %}
-          {% if traffictype == 'Tieliikenne' %}
+          {% if traffictype == "Tieliikenne" or traffictype == "Road" %}
             {% assign has_road = true %}
           {% endif %}
-          {% if traffictype == 'Rautatieliikenne' %}
+          {% if traffictype == "Rautatieliikenne" or traffictype == "Railway" %}
             {% assign has_rail = true %}
           {% endif %}
-          {% if traffictype == 'Meriliikenne' %}
+          {% if traffictype == "Meriliikenne" or traffictype == "Maritime" %}
             {% assign has_marine = true %}
           {% endif %}
-          {% if traffictype == 'Kokeellinen' %}
+          {% if traffictype == "Kokeellinen" or traffictype == "Experimental" %}
             {% assign has_experimental = true %}
           {% endif %}
         {% endfor %}
@@ -42,20 +42,20 @@ <h4 class="h4 sidebar__filter-section-heading">{{ site.t.traffictype[page.lang]
           <div class="col-xs-10 u--no-padding">
             <div class="checkbox">
               <label>
-                <input type="checkbox" data-filtervalue="tieliikenne" data-filtertype="traffictype">
+                <input type="checkbox" data-filtervalue="{{ site.t.tieliikenne[page.lang] | downcase }}" data-filtertype="traffictype">
                 <svg width="20" height="20">
                   <path class="checked" d="M16,0H2C0.9,0,0,0.9,0,2v14c0,1.1,0.9,2,2,2h14c1.1,0,2-0.9,2-2V2C18,0.9,17.1,0,16,0z M7,14L2,9l1.4-1.4L7,11.2l7.6-7.6L16,5L7,14z"/>
                   <path class="indeterminate" d="M16,0H2C0.9,0,0,0.9,0,2v14c0,1.1,0.9,2,2,2h14c1.1,0,2-0.9,2-2V2C18,0.9,17.1,0,16,0z M14,10H4V8h10V10z"/>
                   <path class="unchecked" d="M16,2v14H2V2H16 M16,0H2C0.9,0,0,0.9,0,2v14c0,1.1,0.9,2,2,2h14c1.1,0,2-0.9,2-2V2C18,0.9,17.1,0,16,0z"/>
                 </svg>
                 <span class="checkbox__label-text">
-                  Tieliikenne
+                  {{ site.t.tieliikenne[page.lang] }}
                 </span>
               </label>
             </div>
           </div>
           <div class="col-xs-2 u--no-padding sidebar__filter-amount-col">
-            <span data-filtervalue="tieliikenne" data-filtertype="traffictype" class="sidebar__filter-amount"></span>
+            <span data-filtervalue="{{ site.t.tieliikenne[page.lang] | downcase }}" data-filtertype="traffictype" class="sidebar__filter-amount"></span>
           </div>
         </div>
       </li>
@@ -66,20 +66,20 @@ <h4 class="h4 sidebar__filter-section-heading">{{ site.t.traffictype[page.lang]
           <div class="col-xs-10 u--no-padding">
             <div class="checkbox">
               <label>
-                <input type="checkbox" data-filtervalue="rautatieliikenne" data-filtertype="traffictype">
+                <input type="checkbox" data-filtervalue="{{ site.t.rautatieliikenne[page.lang] | downcase }}" data-filtertype="traffictype">
                 <svg width="20" height="20">
                   <path class="checked" d="M16,0H2C0.9,0,0,0.9,0,2v14c0,1.1,0.9,2,2,2h14c1.1,0,2-0.9,2-2V2C18,0.9,17.1,0,16,0z M7,14L2,9l1.4-1.4L7,11.2l7.6-7.6L16,5L7,14z"/>
                   <path class="indeterminate" d="M16,0H2C0.9,0,0,0.9,0,2v14c0,1.1,0.9,2,2,2h14c1.1,0,2-0.9,2-2V2C18,0.9,17.1,0,16,0z M14,10H4V8h10V10z"/>
                   <path class="unchecked" d="M16,2v14H2V2H16 M16,0H2C0.9,0,0,0.9,0,2v14c0,1.1,0.9,2,2,2h14c1.1,0,2-0.9,2-2V2C18,0.9,17.1,0,16,0z"/>
                 </svg>
                 <span class="checkbox__label-text">
-                  Rautatieliikenne
+                  {{ site.t.rautatieliikenne[page.lang] }}
                 </span>
               </label>
             </div>
           </div>
           <div class="col-xs-2 u--no-padding sidebar__filter-amount-col">
-            <span data-filtervalue="rautatieliikenne" data-filtertype="traffictype" class="sidebar__filter-amount"></span>
+            <span data-filtervalue="{{ site.t.rautatieliikenne[page.lang] | downcase }}" data-filtertype="traffictype" class="sidebar__filter-amount"></span>
           </div>
         </div>
       </li>
@@ -90,20 +90,20 @@ <h4 class="h4 sidebar__filter-section-heading">{{ site.t.traffictype[page.lang]
           <div class="col-xs-10 u--no-padding">
             <div class="checkbox">
               <label>
-                <input type="checkbox" data-filtervalue="meriliikenne" data-filtertype="traffictype">
+                <input type="checkbox" data-filtervalue="{{ site.t.meriliikenne[page.lang] | downcase }}" data-filtertype="traffictype">
                 <svg width="20" height="20">
                   <path class="checked" d="M16,0H2C0.9,0,0,0.9,0,2v14c0,1.1,0.9,2,2,2h14c1.1,0,2-0.9,2-2V2C18,0.9,17.1,0,16,0z M7,14L2,9l1.4-1.4L7,11.2l7.6-7.6L16,5L7,14z"/>
                   <path class="indeterminate" d="M16,0H2C0.9,0,0,0.9,0,2v14c0,1.1,0.9,2,2,2h14c1.1,0,2-0.9,2-2V2C18,0.9,17.1,0,16,0z M14,10H4V8h10V10z"/>
                   <path class="unchecked" d="M16,2v14H2V2H16 M16,0H2C0.9,0,0,0.9,0,2v14c0,1.1,0.9,2,2,2h14c1.1,0,2-0.9,2-2V2C18,0.9,17.1,0,16,0z"/>
                 </svg>
                 <span class="checkbox__label-text">
-                  Meriliikenne
+                  {{ site.t.meriliikenne[page.lang] }}
                 </span>
               </label>
             </div>
           </div>
           <div class="col-xs-2 u--no-padding sidebar__filter-amount-col">
-            <span data-filtervalue="meriliikenne" data-filtertype="traffictype" class="sidebar__filter-amount"></span>
+            <span data-filtervalue="{{ site.t.meriliikenne[page.lang] | downcase }}" data-filtertype="traffictype" class="sidebar__filter-amount"></span>
           </div>
         </div>
       </li>
@@ -114,20 +114,20 @@ <h4 class="h4 sidebar__filter-section-heading">{{ site.t.traffictype[page.lang]
           <div class="col-xs-10 u--no-padding">
             <div class="checkbox">
               <label>
-                <input type="checkbox" data-filtervalue="kokeellinen" data-filtertype="traffictype">
+                <input type="checkbox" data-filtervalue="{{ site.t.kokeellinen[page.lang] | downcase }}" data-filtertype="traffictype">
                 <svg width="20" height="20">
                   <path class="checked" d="M16,0H2C0.9,0,0,0.9,0,2v14c0,1.1,0.9,2,2,2h14c1.1,0,2-0.9,2-2V2C18,0.9,17.1,0,16,0z M7,14L2,9l1.4-1.4L7,11.2l7.6-7.6L16,5L7,14z"/>
                   <path class="indeterminate" d="M16,0H2C0.9,0,0,0.9,0,2v14c0,1.1,0.9,2,2,2h14c1.1,0,2-0.9,2-2V2C18,0.9,17.1,0,16,0z M14,10H4V8h10V10z"/>
                   <path class="unchecked" d="M16,2v14H2V2H16 M16,0H2C0.9,0,0,0.9,0,2v14c0,1.1,0.9,2,2,2h14c1.1,0,2-0.9,2-2V2C18,0.9,17.1,0,16,0z"/>
                 </svg>
                 <span class="checkbox__label-text">
-                  Kokeellinen
+                  {{ site.t.kokeellinen[page.lang] }}
                 </span>
               </label>
             </div>
           </div>
           <div class="col-xs-2 u--no-padding sidebar__filter-amount-col">
-            <span data-filtervalue="kokeellinen" data-filtertype="traffictype" class="sidebar__filter-amount"></span>
+            <span data-filtervalue="{{ site.t.kokeellinen[page.lang] | downcase }}" data-filtertype="traffictype" class="sidebar__filter-amount"></span>
           </div>
         </div>
       </li>
diff --git a/_layouts/frontpage.html b/_layouts/frontpage.html
index 4d59aa986..bcf5dcc1f 100644
--- a/_layouts/frontpage.html
+++ b/_layouts/frontpage.html
@@ -137,12 +137,12 @@ <h4 class="h4 latest-item__header-text"><a href="{{ post.url | prepend:site.base
                 -->{% if page.lang == "en" %}{{ post.date | date: "%-m/%-d/%Y" }}{% else %}{{ post.date | date: "%-d.%-m.%Y" }}{% endif %}<!--
               --></span><!--
                --><ul class="latest-item__content-type-list"><!--
-                 --><li class="latest-item__content-type"><a href="{{ "/" | prepend:site.baseurl }}{{ post_category | downcase}}" class="link">{{ site.t[post_category][page.lang] }}</a></li><!--
+                 --><li class="latest-item__content-type"><a href="{% include url-home.html %}{{ post_category | downcase}}" class="link">{{ post_category }}</a></li><!--
                --></ul><!--
                --><ul class="latest-item__traffic-type-list"><!--
                  -->{% for traffictype in post.traffictypes %}<!--
                  -->{% assign traffictype_dc = traffictype | downcase %}<!-- 
-                 --><span class="latest-item__traffic-type"><a href="{{ "/" | prepend:site.baseurl }}{{ post_category | downcase }}?traffictype={{ traffictype | downcase }}" class="latest-item__traffic-type-link link">{{ site.t[traffictype_dc][page.lang] }}</a></span><!--
+                 --><span class="latest-item__traffic-type"><a href="{% include url-home.html %}{{ post_category | downcase }}?traffictype={{ traffictype | downcase }}" class="latest-item__traffic-type-link link">{{ traffictype }}</a></span><!--
                  -->{% endfor %}<!--
                --></ul>
                 <!-- /White spaces commented -->
diff --git a/_layouts/posts.html b/_layouts/posts.html
index 2d22b2221..c4352b3c6 100644
--- a/_layouts/posts.html
+++ b/_layouts/posts.html
@@ -34,7 +34,7 @@ <h1 class="h1 h1--page-top posts-in-category__page-heading">{{ page.title }}</h1
       <div class="row">
         <!--Page body-->
         <div class="col-xs-12 col-sm-8 text-body">
-          {% include posts-in-category.html category="Tiedotteet" posts-singular="tiedote" posts-plural="tiedotetta" %}
+          {% include posts-in-category.html category_fi="Tiedotteet" category_en="News" %}
         </div>
         
         <!--Sidebar-->
diff --git a/_posts/2017-07-15-release-en.md b/_posts/2017-07-15-release-en.md
index abd696947..e4239a320 100644
--- a/_posts/2017-07-15-release-en.md
+++ b/_posts/2017-07-15-release-en.md
@@ -4,10 +4,10 @@ lang: en
 ref: 2017-07-15-release
 image: main-data-eol.jpg
 published: true
-categories: Tiedotteet
-traffictypes: 
-  - Tieliikenne
-  - Meriliikenne
+categories: en News
+traffictypes:
+  - Road
+  - Maritime
 tags:
   - APIs
   - Admin
diff --git a/_posts/2017-11-28-release-en.md b/_posts/2017-11-28-release-en.md
index a35646b87..2d4b09cbb 100644
--- a/_posts/2017-11-28-release-en.md
+++ b/_posts/2017-11-28-release-en.md
@@ -4,10 +4,10 @@ lang: en
 ref: 2017-11-28-release
 image: 
 published: true
-categories: Tiedotteet
+categories: en News
 traffictypes:
-  - Tieliikenne
-  - Meriliikenne
+  - Road
+  - Maritime
 tags:
   - APIs
   - Admin
diff --git a/_posts/2018-01-09-release-en.md b/_posts/2018-01-09-release-en.md
index 07dcb7ce0..39296a24c 100644
--- a/_posts/2018-01-09-release-en.md
+++ b/_posts/2018-01-09-release-en.md
@@ -4,9 +4,9 @@ lang: en
 ref: 2018-01-09-release
 image: 
 published: true
-categories: Tiedotteet
+categories: en News
 traffictypes:
-  - Tieliikenne
+  - Road
 tags:
   - APIs
   - Admin