Improve name selection with the query tool

Pass the full expanded list of preferred languages to the client and use that when looking for the best name for an object. Fixes openstreetmap#4310
tomhughes · Oct 24, 2023 · 5067c08 · 5067c08
1 parent 0de0317
commit 5067c08
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
@@ -132,6 +132,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
@@ -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
@@ -48,7 +48,8 @@ def current_page_class(path)
   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