From 32ec339783383c5b197f599daadce917fe3cdf96 Mon Sep 17 00:00:00 2001
From: Guo Yunhe <guoyunhebrave@gmail.com>
Date: Sat, 1 Jul 2017 20:05:32 +0300
Subject: [PATCH] Change language without leave current page

---
 app/views/layouts/_footer.html.erb | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/app/views/layouts/_footer.html.erb b/app/views/layouts/_footer.html.erb
index 240147f28..0981bdfba 100644
--- a/app/views/layouts/_footer.html.erb
+++ b/app/views/layouts/_footer.html.erb
@@ -48,15 +48,17 @@
           &copy; 2011&ndash;2017 openSUSE contributors.
         </div>
         <div class="col-md-6 text-right">
-          Language
+          Language <!-- This label should not be translated! -->
           <div class="dropup dropup_language-menu d-inline-block">
-            <button class="btn btn-secondary dropdown-toggle" type="button" id="dropdownMenu1" data-toggle="dropdown" aria-haspopup="false" aria-expanded="false">
+            <button class="btn btn-secondary dropdown-toggle" type="button" data-toggle="dropdown" aria-haspopup="false" aria-expanded="false">
               <span class="selected-language"><%= LANGUAGE_NAMES[FastGettext.locale] %></span>
               <span class="caret"></span>
             </button>
-            <ul class="dropdown-menu dropdown-menu-right" aria-labelledby="dropdownMenu1">
+            <ul class="dropdown-menu dropdown-menu-right">
               <% LANGUAGES.sort.each do |lang| %>
-                <li class="dropdown-item"><a href="/?locale=<%= lang %>" class="change-language" data-language-value="<% lang %>"><%= LANGUAGE_NAMES[lang] %></a></li>
+                <li class="dropdown-item">
+                  <%= link_to LANGUAGE_NAMES[lang], params.merge(:locale => lang) %>
+                </li>
               <% end -%>
             </ul>
           </div>