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 #4310

diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index 5bfe86b8607b58a9458e03db6b17306ca1b88b1e..af67244bcb706604ed139f4758bb3bef504970b3 100644 (file)
--- 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 e44db9fdf0d012b4b8a3bd1f237c160e283cbabc..59c3a8b495c29638e57cd25ca677b064009f9b98 100644 (file)
--- 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 28c97e485f372242369c444f12057aa405c64926..2fc0d808d53c87566318ac254b8f523587952726 100644 (file)
--- 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