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

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

diff --git a/app/helpers/browse_helper.rb b/app/helpers/browse_helper.rb
index 9a49abd679c015f4c3a02259e9b9a2ac849f549d..63f48a876ee14653f8d2205674b34d639c073f5a 100644 (file)
--- a/app/helpers/browse_helper.rb
+++ b/app/helpers/browse_helper.rb
@@ -1,110 +1,74 @@
 module BrowseHelper
 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
     end

-    return name
-  end

 
 

-  def link_class(type, object)
-    return type + " " + h(icon_tags(object).join(' ')) + (object.visible == false ? ' deleted' : '')
+    name

   end
 
   end
 

-  def link_title(object)
-    return h(icon_tags(object).map { |k,v| k + '=' + v }.to_sentence)
-  end
+  def link_class(type, object)
+    classes = [type]

 
 

-  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)
+    if object.redacted?
+      classes << "deleted"

     else
     else

-      h(key)
+      classes += icon_tags(object).flatten.map { |t| h(t) }
+      classes << "deleted" unless object.visible?

     end
     end

-  end

 
 

-  def format_value(key, value)
-    if wp = wikipedia_link(key, value)
-      link_to h(wp[:title]), wp[:url], :title => t('browse.tag_details.wikipedia_link', :page => wp[:title])
-    elsif url = wiki_link("tag", "#{key}=#{value}")
-      link_to h(value), url, :title => t('browse.tag_details.wiki_link.tag', :key => key, :value => value)
-    else
-      linkify h(value)
-    end
+    classes.join(" ")

   end
 
   end
 

-  def note_author(object)
-    if object.author.nil?
-      h(object.author_name)
+  def link_title(object)
+    if object.redacted?
+      ""

     else
     else

-      link_to h(object.author_name), :controller => "user", :action => "view", :display_name => object.author_name
+      h(icon_tags(object).map { |k, v| k + "=" + v }.to_sentence)

     end
   end
 
     end
   end
 

-private
-
-  ICON_TAGS = [ 
-    "aeroway", "amenity", "barrier", "building", "highway", "historic", "landuse",
-    "leisure", "man_made", "natural", "railway", "shop", "tourism", "waterway"
-  ]
-
-  def icon_tags(object)
-    object.tags.find_all { |k,v| ICON_TAGS.include? k }
+  def link_follow(object)
+    "nofollow" if object.tags.empty?

   end
 
   end
 

-  def wiki_link(type, lookup)
-    locale = I18n.locale.to_s
-
-    # update-wiki-pages does s/ /_/g on keys before saving them, we
-    # have to replace spaces with underscore so we'll link
-    # e.g. `source=Isle of Man Government aerial imagery (2001)' to
-    # the correct page.
-    lookup_us = lookup.tr(" ", "_")
-
-    if page = WIKI_PAGES[locale][type][lookup_us] rescue nil
-      url = "http://wiki.openstreetmap.org/wiki/#{page}?uselang=#{locale}"
-    elsif page = WIKI_PAGES["en"][type][lookup_us] 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

-
-    return url

   end
 
   end
 

-  def wikipedia_link(key, value)
-    # Some k/v's are wikipedia=http://en.wikipedia.org/wiki/Full%20URL
-    return nil if value =~ /^http:\/\//
+  private

 
 

-    if key == "wikipedia"
-      # This regex should match Wikipedia language codes, everything
-      # from de to zh-classical
-      if value =~ /^([a-z-]{2,12}):(.+)$/
-        # Value is <lang>:<title> so split it up
-        lang  = $1
-        value = $2
-      else
-        # Value is <title> so default to English Wikipedia
-        lang = 'en'
-      end
-    elsif key =~ /^wikipedia:(\S+)$/
-      # Language is in the key, so assume value is a simple title
-      lang = $1
-    else
-      # Not a wikipedia key!
-      return nil
-    end
+  ICON_TAGS = %w[aeroway amenity barrier building highway historic landuse leisure man_made natural railway shop tourism waterway].freeze

 
 

-    return {
-      :url => "http://#{lang}.wikipedia.org/wiki/#{value}?uselang=#{I18n.locale}",
-      :title => value
-    }
+  def icon_tags(object)
+    object.tags.find_all { |k, _v| ICON_TAGS.include? k }.sort

   end
 end
   end
 end