From d6afeb8771b6838b9455fcade5e1b4985f9ac077 Mon Sep 17 00:00:00 2001
From: Etienne Ischer <etienne.ischer@arcanite.ch>
Date: Tue, 27 Apr 2021 15:59:57 +0200
Subject: [PATCH] improve locale selection

---
 app/javascript/packs/application.js |  2 +-
 app/views/layouts/_locales.html.erb | 24 ++++++++++++------------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/app/javascript/packs/application.js b/app/javascript/packs/application.js
index 15eb5d8..2397e74 100644
--- a/app/javascript/packs/application.js
+++ b/app/javascript/packs/application.js
@@ -12,7 +12,7 @@ import "bootstrap"
 import "../stylesheets/application"
 
 import "@fortawesome/fontawesome-free/css/all"
-import "flag-icon-css/sass/flag-icon"
+import "flag-icon-css/css/flag-icon"
 
 document.addEventListener("turbolinks:load", () => {
   $('[data-toggle="tooltip"]').tooltip()
diff --git a/app/views/layouts/_locales.html.erb b/app/views/layouts/_locales.html.erb
index 36beba9..2b58af6 100644
--- a/app/views/layouts/_locales.html.erb
+++ b/app/views/layouts/_locales.html.erb
@@ -3,17 +3,17 @@
       <i class="fas fa-globe-europe"></i>
   </a>
   <ul class="dropdown-menu dropdown-menu-end" aria-labelledby="navbarDropdown">
-    <li class="dropdown-item"><%= link_to '<span class="flag-icon flag-icon-de"></span>'.html_safe, root_path(locale: 'de-de') %></li>
-    <li class="dropdown-item"><%= link_to '<span class="flag-icon flag-icon-gb"></span>'.html_safe, root_path(locale: 'en-gb') %></li>
-    <li class="dropdown-item"><%= link_to '<span class="flag-icon flag-icon-us"></span>'.html_safe, root_path(locale: 'en-us') %></li>
-    <li class="dropdown-item"><%= link_to '<span class="flag-icon flag-icon-mx"></span>'.html_safe, root_path(locale: 'es-mx') %></li>
-    <li class="dropdown-item"><%= link_to '<span class="flag-icon flag-icon-br"></span>'.html_safe, root_path(locale: 'pt-br') %></li>
-    <li class="dropdown-item"><%= link_to '<span class="flag-icon flag-icon-es"></span>'.html_safe, root_path(locale: 'es-es') %></li>
-    <li class="dropdown-item"><%= link_to '<span class="flag-icon flag-icon-fr"></span>'.html_safe, root_path(locale: 'fr-fr') %></li>
-    <li class="dropdown-item"><%= link_to '<span class="flag-icon flag-icon-it"></span>'.html_safe, root_path(locale: 'it') %></li>
-    <li class="dropdown-item"><%= link_to '<span class="flag-icon flag-icon-ru"></span>'.html_safe, root_path(locale: 'ru-ru') %></li>
-    <li class="dropdown-item"><%= link_to '<span class="flag-icon flag-icon-kr"></span>'.html_safe, root_path(locale: 'ko') %></li>
-    <li class="dropdown-item"><%= link_to '<span class="flag-icon flag-icon-tw"></span>'.html_safe, root_path(locale: 'zh-tw') %></li>
-    <li class="dropdown-item"><%= link_to '<span class="flag-icon flag-icon-cn"></span>'.html_safe, root_path(locale: 'zh-cn') %></li>
+    <li class="dropdown-item"><%= link_to '<span class="flag-icon flag-icon-de"></span>'.html_safe, url_for(params.clone.permit!.merge(locale: 'de-de', only_path: true)) %></li>
+    <li class="dropdown-item"><%= link_to '<span class="flag-icon flag-icon-gb"></span>'.html_safe, url_for(params.clone.permit!.merge(locale: 'en-gb', only_path: true)) %></li>
+    <li class="dropdown-item"><%= link_to '<span class="flag-icon flag-icon-us"></span>'.html_safe, url_for(params.clone.permit!.merge(locale: 'en-us', only_path: true)) %></li>
+    <li class="dropdown-item"><%= link_to '<span class="flag-icon flag-icon-mx"></span>'.html_safe, url_for(params.clone.permit!.merge(locale: 'es-mx', only_path: true)) %></li>
+    <li class="dropdown-item"><%= link_to '<span class="flag-icon flag-icon-br"></span>'.html_safe, url_for(params.clone.permit!.merge(locale: 'pt-br', only_path: true)) %></li>
+    <li class="dropdown-item"><%= link_to '<span class="flag-icon flag-icon-es"></span>'.html_safe, url_for(params.clone.permit!.merge(locale: 'es-es', only_path: true)) %></li>
+    <li class="dropdown-item"><%= link_to '<span class="flag-icon flag-icon-fr"></span>'.html_safe, url_for(params.clone.permit!.merge(locale: 'fr-fr', only_path: true)) %></li>
+    <li class="dropdown-item"><%= link_to '<span class="flag-icon flag-icon-it"></span>'.html_safe, url_for(params.clone.permit!.merge(locale: 'it', only_path: true)) %></li>
+    <li class="dropdown-item"><%= link_to '<span class="flag-icon flag-icon-ru"></span>'.html_safe, url_for(params.clone.permit!.merge(locale: 'ru-ru', only_path: true)) %></li>
+    <li class="dropdown-item"><%= link_to '<span class="flag-icon flag-icon-kr"></span>'.html_safe, url_for(params.clone.permit!.merge(locale: 'ko', only_path: true)) %></li>
+    <li class="dropdown-item"><%= link_to '<span class="flag-icon flag-icon-tw"></span>'.html_safe, url_for(params.clone.permit!.merge(locale: 'zh-tw', only_path: true)) %></li>
+    <li class="dropdown-item"><%= link_to '<span class="flag-icon flag-icon-cn"></span>'.html_safe, url_for(params.clone.permit!.merge(locale: 'zh-cn', only_path: true)) %></li>
   </ul>
 </li>