Don't fall back to name:en if it's not in the user's language list

Fix to #2755

diff --git a/app/helpers/browse_helper.rb b/app/helpers/browse_helper.rb
index cf2bc64742dc6faebb72e511a7c9ebb958b537e2..4519567d2b7f8f7af1c81b8cd3b5f4704576f9cf 100644 (file)
--- a/app/helpers/browse_helper.rb
+++ b/app/helpers/browse_helper.rb
@@ -13,7 +13,7 @@ module BrowseHelper
     unless object.redacted?
       available_locales = Locale.list(name_locales(object))
 
     unless object.redacted?
       available_locales = Locale.list(name_locales(object))
 

-      locale = available_locales.preferred(preferred_languages)
+      locale = available_locales.preferred(preferred_languages, :default => nil)

 
       if object.tags.include? "name:#{locale}"
         name = t "printable_name.with_name_html", :name => tag.bdi(object.tags["name:#{locale}"].to_s), :id => tag.bdi(name)
 
       if object.tags.include? "name:#{locale}"
         name = t "printable_name.with_name_html", :name => tag.bdi(object.tags["name:#{locale}"].to_s), :id => tag.bdi(name)

diff --git a/lib/locale.rb b/lib/locale.rb
index b0ad20fc793f4bd4332057af1002c38a39e3cfdd..56d3985760f8447455bcf93f7dd181fd949d60a3 100644 (file)
--- a/lib/locale.rb
+++ b/lib/locale.rb
@@ -10,8 +10,8 @@ class Locale < I18n::Locale::Tag::Rfc4646
       preferred.expand & self
     end
 
       preferred.expand & self
     end
 

-    def preferred(preferred)
-      candidates(preferred).first
+    def preferred(preferred, options = { :default => Locale.default })
+      candidates(preferred).first || options[:default]

     end
 
     def expand
     end
 
     def expand


@@ -19,7 +19,7 @@ class Locale < I18n::Locale::Tag::Rfc4646
                  locale.candidates.uniq.reverse_each do |candidate|
                    expanded << candidate if candidate == locale || !expanded.include?(candidate)
                  end
                  locale.candidates.uniq.reverse_each do |candidate|
                    expanded << candidate if candidate == locale || !expanded.include?(candidate)
                  end

-               end.reverse.uniq << Locale.default)
+               end.reverse.uniq)

     end
   end
 
     end
   end