From 85edf90bcb2717c01132e0f49b58dcff84728e46 Mon Sep 17 00:00:00 2001
From: Kai Michael Poppe <kai@poppe.dev>
Date: Tue, 8 Sep 2026 13:54:41 +0200
Subject: [PATCH] Fix double load of the language selector

Resolves intermittent SelectLanguageTest errors
---
 app/assets/javascripts/application.js | 18 +++++++++---------
 app/views/layouts/_header.html.erb    |  2 +-
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index 85f6365bb..68fed4da5 100644
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -225,18 +225,18 @@ $(function () {
   });
 
   $("#select_language_dialog").on("shown.bs.modal", function () {
+    $("#language_search").trigger("focus");
+  });
+
+  $("#select_language_dialog").on("show.bs.modal", function () {
     $("#language_search")
       .val("")
-      .trigger("input")
-      .trigger("focus");
+      .trigger("input");
     const $frame = $("#select_language_list");
-    const originalSrc = new URL($frame.attr("src"), window.location.origin);
-
-    // Set `source` query param to current page path + query string
-    originalSrc.searchParams.set("source", window.location.pathname + window.location.search);
-
-    if ($frame.attr("src") !== originalSrc.toString()) {
-      $frame.attr("src", originalSrc.toString());
+    const src = new URL($frame.data("src"), window.location.origin);
+    src.searchParams.set("source", window.location.pathname + window.location.search);
+    if ($frame.attr("src") !== src.toString()) {
+      $frame.attr("src", src.toString());
     }
   });
 });
diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb
index 3be1a06bb..80245aab3 100644
--- a/app/views/layouts/_header.html.erb
+++ b/app/views/layouts/_header.html.erb
@@ -94,7 +94,7 @@
         <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="<%= t "javascripts.close" %>"></button>
       </div>
       <div class="modal-body px-1">
-        <turbo-frame id="select_language_list" src="<%= languages_pane_path %>?source=<%= ERB::Util.url_encode(request.fullpath) %>" loading="lazy">
+        <turbo-frame id="select_language_list" data-src="<%= languages_pane_path %>">
           <div class="text-center py-3"><%= render "loader" %></div>
         </turbo-frame>
       </div>
-- 
2.47.3