Merge remote-tracking branch 'upstream/pull/2136'

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

diff --git a/app/helpers/browse_helper.rb b/app/helpers/browse_helper.rb
index 1d0b02df03e88229b7b86b72bb626c04d4ae0357..63f48a876ee14653f8d2205674b34d639c073f5a 100644 (file)
--- a/app/helpers/browse_helper.rb
+++ b/app/helpers/browse_helper.rb
@@ -1,48 +1,74 @@
 module BrowseHelper
-  def link_to_page(page, page_param)
-    return link_to(page, page_param => page)
-  end
-  
-  def printable_name(object, version=false)
-    name = t 'printable_name.with_id', :id => object.id.to_s
-    if version
-      name = t 'printable_name.with_version', :id => name, :version => object.version.to_s
-    end
-    if object.tags.include? "name:#{I18n.locale}"
-      name = t 'printable_name.with_name',  :name => object.tags["name:#{I18n.locale}"].to_s, :id => name
-    elsif object.tags.include? 'name'
-      name = t 'printable_name.with_name',  :name => object.tags['name'].to_s, :id => name
+  def printable_name(object, version = false)
+    id = if object.id.is_a?(Array)
+           object.id[0]
+         else
+           object.id
+         end
+    name = t "printable_name.with_id", :id => id.to_s
+    name = t "printable_name.with_version", :id => name, :version => object.version.to_s if version
+
+    # don't look at object tags if redacted, so as to avoid giving
+    # away redacted version tag information.
+    unless object.redacted?
+      locale = I18n.locale.to_s
+
+      locale = locale.sub(/-[^-]+/, "") while locale =~ /-[^-]+/ && !object.tags.include?("name:#{I18n.locale}")
+
+      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)
+      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)
+      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)
+      end
     end
-    return name
+
+    name
   end
 
-  def format_key(key)
-    if url = wiki_link("key", key)
-      link_to h(key), url, :title => t('browse.tag_details.wiki_link.key', :key => key)
+  def link_class(type, object)
+    classes = [type]
+
+    if object.redacted?
+      classes << "deleted"
     else
-      h(key)
+      classes += icon_tags(object).flatten.map { |t| h(t) }
+      classes << "deleted" unless object.visible?
     end
+
+    classes.join(" ")
   end
 
-  def format_value(key, value)
-    if url = wiki_link("tag", "#{key}=#{value}")
-      link_to h(value), url, :title => t('browse.tag_details.wiki_link.tag', :key => key, :value => value)
+  def link_title(object)
+    if object.redacted?
+      ""
     else
-      linkify h(value)
+      h(icon_tags(object).map { |k, v| k + "=" + v }.to_sentence)
     end
   end
 
-private
-
-  def wiki_link(type, lookup)
-    locale = I18n.locale.to_s
+  def link_follow(object)
+    "nofollow" if object.tags.empty?
+  end
 
-    if page = WIKI_PAGES[locale][type][lookup] rescue nil
-      url = "http://wiki.openstreetmap.org/wiki/#{page}?uselang=#{locale}"
-    elsif page = WIKI_PAGES["en"][type][lookup] rescue nil
-      url = "http://wiki.openstreetmap.org/wiki/#{page}?uselang=#{locale}"
+  def type_and_paginated_count(type, pages)
+    if pages.page_count == 1
+      t "browse.changeset.#{type}",
+        :count => pages.item_count
+    else
+      t "browse.changeset.#{type}_paginated",
+        :x => pages.current_page.first_item,
+        :y => pages.current_page.last_item,
+        :count => pages.item_count
     end
+  end
+
+  private
+
+  ICON_TAGS = %w[aeroway amenity barrier building highway historic landuse leisure man_made natural railway shop tourism waterway].freeze
 
-    return url
+  def icon_tags(object)
+    object.tags.find_all { |k, _v| ICON_TAGS.include? k }.sort
   end
 end