Update rubocop todo

[rails.git] / app / helpers / browse_helper.rb

diff --git a/app/helpers/browse_helper.rb b/app/helpers/browse_helper.rb
index 14b1f7cc22d1b04e92acdc52dd790bb6797602c0..0f533770b8042165245e0d036b066626c4b97a30 100644 (file)
--- a/app/helpers/browse_helper.rb
+++ b/app/helpers/browse_helper.rb
@@ -1,5 +1,5 @@
 module BrowseHelper
-  def printable_name(object, version = false)
+  def printable_name(object, version: false)
     id = if object.id.is_a?(Array)
            object.id[0]
          else
@@ -11,28 +11,16 @@ 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, :default => nil)
 
       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)
+        name = t "printable_name.with_name_html", :name => tag.bdi(object.tags["name:#{locale}"].to_s), :id => tag.bdi(name)
       elsif object.tags.include? "name"
-        name = t "printable_name.with_name_html", :name => content_tag(:bdi, object.tags["name"].to_s), :id => content_tag(:bdi, name)
+        name = t "printable_name.with_name_html", :name => tag.bdi(object.tags["name"].to_s), :id => tag.bdi(name)
       elsif object.tags.include? "ref"
-        name = t "printable_name.with_name_html", :name => content_tag(:bdi, object.tags["ref"].to_s), :id => content_tag(:bdi, name)
+        name = t "printable_name.with_name_html", :name => tag.bdi(object.tags["ref"].to_s), :id => tag.bdi(name)
       end
     end
 
@@ -56,7 +44,7 @@ module BrowseHelper
     if object.redacted?
       ""
     else
-      h(icon_tags(object).map { |k, v| k + "=" + v }.to_sentence)
+      h(icon_tags(object).map { |k, v| "#{k}=#{v}" }.to_sentence)
     end
   end