From: Tom Hughes <tom@compton.nu>
Date: Sun, 7 Jun 2020 18:10:48 +0000 (+0100)
Subject: More improvements to locale selection for the data browser
X-Git-Tag: live~2696
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/d6f518f6279ddd8e07d8f78577b1414567fc6a5c

More improvements to locale selection for the data browser

Use the browser language preferences for non-logged in users.
---

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 009984594..045e93eb7 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -12,6 +12,7 @@ class ApplicationController < ActionController::Base
   attr_accessor :current_user
 
   helper_method :current_user
+  helper_method :preferred_langauges
 
   private
 
diff --git a/app/helpers/browse_helper.rb b/app/helpers/browse_helper.rb
index 14b1f7cc2..2f61631b7 100644
--- a/app/helpers/browse_helper.rb
+++ b/app/helpers/browse_helper.rb
@@ -11,21 +11,9 @@ module BrowseHelper
     # don't look at object tags if redacted, so as to avoid giving
     # away redacted version tag information.
     unless object.redacted?
-      available_locales = Locale::List.new(name_locales(object))
+      available_locales = Locale.list(name_locales(object))
 
-      Rails.logger.info "available_locales = #{available_locales.map(&:to_s)}"
-
-      preferred_locales = if current_user
-                            current_user.preferred_languages
-                          else
-                            Locale.new(I18n.locale).candidates
-                          end
-
-      Rails.logger.info "preferred_locales = #{preferred_locales.expand.map(&:to_s)}"
-
-      locale = available_locales.preferred(preferred_locales)
-
-      Rails.logger.info "locale = #{locale}"
+      locale = available_locales.preferred(preferred_languages)
 
       if object.tags.include? "name:#{locale}"
         name = t "printable_name.with_name_html", :name => content_tag(:bdi, object.tags["name:#{locale}"].to_s), :id => content_tag(:bdi, name)
diff --git a/test/helpers/browse_helper_test.rb b/test/helpers/browse_helper_test.rb
index 7141cda60..8e46f6ff3 100644
--- a/test/helpers/browse_helper_test.rb
+++ b/test/helpers/browse_helper_test.rb
@@ -154,7 +154,7 @@ class BrowseHelperTest < ActionView::TestCase
 
   private
 
-  def current_user
-    nil
+  def preferred_languages
+    Locale.list(I18n.locale)
   end
 end