From 79979931c19c501687d931fbe33d1b58aa32c7ac Mon Sep 17 00:00:00 2001
From: arttu <arttu.makiporhola@geniem.com>
Date: Wed, 13 Feb 2019 10:36:29 +0200
Subject: [PATCH 1/2] clear language slug for default language

---
 content/themes/custom/models/shared/header.php        | 11 +++++++++--
 .../themes/custom/partials/shared/search-section.dust |  2 +-
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/content/themes/custom/models/shared/header.php b/content/themes/custom/models/shared/header.php
index dbf6716..ef832ad 100644
--- a/content/themes/custom/models/shared/header.php
+++ b/content/themes/custom/models/shared/header.php
@@ -8,10 +8,17 @@ public function Analytics() {
 
     /**
      * Get the slug for current language
+     *
+     * @return string
      */
-    public function LangSlug() {
+    public function LangSlug() : string {
         $slug = pll_current_language();
-        return $slug;
+
+        if ( $slug !== pll_default_language() ) {
+            return $slug;
+        }
+
+        return '';
     }
 
     public function HomeUrl() {
diff --git a/content/themes/custom/partials/shared/search-section.dust b/content/themes/custom/partials/shared/search-section.dust
index dedda6b..36267c1 100644
--- a/content/themes/custom/partials/shared/search-section.dust
+++ b/content/themes/custom/partials/shared/search-section.dust
@@ -2,7 +2,7 @@
 <section class="search-box">
     <div class="row">
         <div class="small-12 columns align-center">
-            <form class="search-box__form" method="get" action="/{Header.LangSlug}/">
+            <form class="search-box__form" method="get" action="/{Header.LangSlug}">
                 <h3 class="search-heading">{@apitranslation path="haku.search_title" fallback="haku.search_title" /}</h3>
                 <div class="row collapse align-center">
                     <div class="small-12 columns search-input-container">

From 616ffa08d696673834b557a2e321688972f5f82a Mon Sep 17 00:00:00 2001
From: arttu <arttu.makiporhola@geniem.com>
Date: Wed, 13 Feb 2019 10:39:13 +0200
Subject: [PATCH 2/2] fix non main language slugs

---
 content/themes/custom/partials/shared/search-section.dust | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/content/themes/custom/partials/shared/search-section.dust b/content/themes/custom/partials/shared/search-section.dust
index 36267c1..8e3a556 100644
--- a/content/themes/custom/partials/shared/search-section.dust
+++ b/content/themes/custom/partials/shared/search-section.dust
@@ -2,7 +2,7 @@
 <section class="search-box">
     <div class="row">
         <div class="small-12 columns align-center">
-            <form class="search-box__form" method="get" action="/{Header.LangSlug}">
+            <form class="search-box__form" method="get" action="/{?Header.LangSlug}{Header.LangSlug}/{/Header.LangSlug}">
                 <h3 class="search-heading">{@apitranslation path="haku.search_title" fallback="haku.search_title" /}</h3>
                 <div class="row collapse align-center">
                     <div class="small-12 columns search-input-container">