From b4981d94abd3a312174ee6b4e42f08ae662d95f4 Mon Sep 17 00:00:00 2001
From: Anton Khorev <tony29@yandex.ru>
Date: Fri, 20 Jun 2025 14:41:24 +0300
Subject: [PATCH] Change language instead of opening preferences when logged in

---
 app/assets/javascripts/language_selector.js   | 10 +++++--
 app/views/layouts/_header.html.erb            | 24 +++++++--------
 .../layouts/_select_language_button.html.erb  |  4 +++
 test/system/select_language_test.rb           | 29 +++++++++++++++++++
 4 files changed, 51 insertions(+), 16 deletions(-)

diff --git a/app/assets/javascripts/language_selector.js b/app/assets/javascripts/language_selector.js
index 83525a54d..105c19f52 100644
--- a/app/assets/javascripts/language_selector.js
+++ b/app/assets/javascripts/language_selector.js
@@ -2,7 +2,13 @@ $(document).on("click", "#select_language_dialog [data-language-code]", function
   e.preventDefault();
 
   const code = $(this).data("language-code");
+  const form = this.closest("form");
 
-  Cookies.set("_osm_locale", code, { secure: true, path: "/", samesite: "lax" });
-  location.reload();
+  if (form) {
+    form.elements.language.value = code;
+    form.submit();
+  } else {
+    Cookies.set("_osm_locale", code, { secure: true, path: "/", samesite: "lax" });
+    location.reload();
+  }
 });
diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb
index 2a1d09295..6206f3dd8 100644
--- a/app/views/layouts/_header.html.erb
+++ b/app/views/layouts/_header.html.erb
@@ -67,17 +67,7 @@
         </ul>
       </li>
       <li class="nav-item ps-1 not-collapsible">
-        <% if current_user && current_user.id %>
-          <%= link_to(basic_preferences_path, :class => "nav-link text-secondary") do %>
-            <%= render "layouts/select_language_button" %>
-          <% end %>
-        <% else %>
-          <%= tag.button :type => "button",
-                         :class => "btn btn-link p-0 text-secondary",
-                         :data => { :bs_toggle => "modal", :bs_target => "#select_language_dialog" } do %>
-            <%= render "layouts/select_language_button" %>
-          <% end %>
-        <% end %>
+        <%= render "layouts/select_language_button" %>
       </li>
     </ul>
     <% if current_user && current_user.id %>
@@ -116,7 +106,6 @@
   </nav>
 </header>
 
-<% unless current_user&.id %>
 <div class="modal fade" id="select_language_dialog" data-bs-backdrop="static" data-bs-keyboard="false" tabindex="-1" aria-labelledby="select_language_dialog_label" aria-hidden="true">
   <div class="modal-dialog modal-lg modal-dialog-scrollable">
     <div class="modal-content">
@@ -125,9 +114,16 @@
         <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="<%= t "javascripts.close" %>"></button>
       </div>
       <div class="modal-body px-1">
-        <%= render "layouts/select_language_list" %>
+        <% if current_user&.id %>
+          <%= form_tag basic_preferences_path, :method => "PUT" do %>
+            <%= hidden_field_tag "referer", request.fullpath %>
+            <%= hidden_field_tag "language", I18n.locale %>
+            <%= render "layouts/select_language_list" %>
+          <% end %>
+        <% else %>
+          <%= render "layouts/select_language_list" %>
+        <% end %>
       </div>
     </div>
   </div>
 </div>
-<% end %>
diff --git a/app/views/layouts/_select_language_button.html.erb b/app/views/layouts/_select_language_button.html.erb
index f88933c03..8459a7a25 100644
--- a/app/views/layouts/_select_language_button.html.erb
+++ b/app/views/layouts/_select_language_button.html.erb
@@ -1,4 +1,8 @@
+<%= tag.button :type => "button",
+               :class => "btn btn-link p-0 text-secondary",
+               :data => { :bs_toggle => "modal", :bs_target => "#select_language_dialog" } do %>
   <svg width="20" height="20" fill="currentColor" class="d-block">
     <title><%= t ".title" %></title>
     <path d="M20 18h-1.44a.61.61 0 0 1-.4-.12.81.81 0 0 1-.23-.31L17 15h-5l-1 2.54a.77.77 0 0 1-.22.3.59.59 0 0 1-.4.14H9l4.55-11.47h1.89zm-3.53-4.31L14.89 9.5a11.62 11.62 0 0 1-.39-1.24q-.09.37-.19.69l-.19.56-1.58 4.19zm-6.3-1.58a13.43 13.43 0 0 1-2.91-1.41 11.46 11.46 0 0 0 2.81-5.37H12V4H7.31a4 4 0 0 0-.2-.56C6.87 2.79 6.6 2 6.6 2l-1.47.5s.4.89.6 1.5H0v1.33h2.15A11.23 11.23 0 0 0 5 10.7a17.19 17.19 0 0 1-5 2.1q.56.82.87 1.38a23.28 23.28 0 0 0 5.22-2.51 15.64 15.64 0 0 0 3.56 1.77zM3.63 5.33h4.91a8.11 8.11 0 0 1-2.45 4.45 9.11 9.11 0 0 1-2.46-4.45z" />
   </svg>
+<% end %>
diff --git a/test/system/select_language_test.rb b/test/system/select_language_test.rb
index d11c3497a..c928e8a87 100644
--- a/test/system/select_language_test.rb
+++ b/test/system/select_language_test.rb
@@ -17,4 +17,33 @@ class SelectLanguageTest < ApplicationSystemTestCase
       assert_text "Obtenir de l’aide"
     end
   end
+
+  test "can select language when logged in" do
+    user = create(:user, :display_name => "LanguageTestUser")
+    sign_in_as(user)
+
+    visit help_path
+
+    assert_no_text "Préférences mises à jour"
+    within_content_heading do
+      assert_text "Getting Help"
+      assert_no_text "Obtenir de l’aide"
+    end
+
+    click_on "Select Language"
+    click_on "français"
+
+    assert_text "Préférences mises à jour"
+    within_content_heading do
+      assert_no_text "Getting Help"
+      assert_text "Obtenir de l’aide"
+    end
+
+    click_on "LanguageTestUser"
+    click_on "Mes préférences"
+
+    within_content_body do
+      assert_select "Langue préférée", :selected => "français"
+    end
+  end
 end
-- 
2.39.5