From: Andy Allan <git@gravitystorm.co.uk>
Date: Wed, 15 Nov 2023 15:34:28 +0000 (+0000)
Subject: Merge pull request #4311 from tomhughes/query-locales
X-Git-Tag: live~1442
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/6016acb7e9c0a3d3f75632aa64694a19b0eafe1a?hp=3d5ad709fa6cd47a7d5c1dd750bfa551e5811b39

Merge pull request #4311 from tomhughes/query-locales

Improve name selection with the query tool
---

diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index 5bfe86b86..af67244bc 100644
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -124,6 +124,7 @@ $(document).ready(function () {
   I18n.fallbacks = true;
 
   OSM.preferred_editor = application_data.preferredEditor;
+  OSM.preferred_languages = application_data.preferredLanguages;
 
   if (application_data.user) {
     OSM.user = application_data.user;
diff --git a/app/assets/javascripts/index/query.js b/app/assets/javascripts/index/query.js
index e44db9fdf..59c3a8b49 100644
--- a/app/assets/javascripts/index/query.js
+++ b/app/assets/javascripts/index/query.js
@@ -125,7 +125,7 @@ OSM.Query = function (map) {
 
   function featureName(feature) {
     var tags = feature.tags,
-        locales = I18n.locales.get();
+        locales = OSM.preferred_languages;
 
     for (var i = 0; i < locales.length; i++) {
       if (tags["name:" + locales[i]]) {
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 28c97e485..2fc0d808d 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -48,7 +48,8 @@ module ApplicationHelper
   def application_data
     data = {
       :locale => I18n.locale,
-      :preferred_editor => preferred_editor
+      :preferred_editor => preferred_editor,
+      :preferred_languages => preferred_languages.expand.map(&:to_s)
     }
 
     if current_user