Merge pull request #14 from tomhughes/routing

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

diff --git a/app/helpers/browse_helper.rb b/app/helpers/browse_helper.rb
index ffc638cdf491a6c7a22d57f420568f0ed173faa7..b192a63d558ee4c4ba8bd7e06dc815536168a1fa 100644 (file)
--- a/app/helpers/browse_helper.rb
+++ b/app/helpers/browse_helper.rb
@@ -1,8 +1,4 @@
 module BrowseHelper
-  def link_to_page(page, page_param)
-    return link_to(page, page_param => page)
-  end
-
   def printable_name(object, version=false)
     if object.id.is_a?(Array)
       id = object.id[0]
@@ -14,7 +10,7 @@ module BrowseHelper
       name = t 'printable_name.with_version', :id => name, :version => object.version.to_s
     end
 
-    # don't look at object tags if redacted, so as to avoid giving 
+    # don't look at object tags if redacted, so as to avoid giving
     # away redacted version tag information.
     unless object.redacted?
       if object.tags.include? "name:#{I18n.locale}"
@@ -28,11 +24,16 @@ module BrowseHelper
   end
 
   def link_class(type, object)
+    classes = [ type ]
+
     if object.redacted?
-      type + " deleted"
+      classes << "deleted"
     else
-      type + " " + h(icon_tags(object).join(' ')) + (object.visible == false ? ' deleted' : '')
+      classes += icon_tags(object).flatten.map { |t| h(t) }
+      classes << "deleted" unless object.visible?
     end
+
+    classes.join(" ")
   end
 
   def link_title(object)
@@ -61,9 +62,21 @@ module BrowseHelper
     end
   end
 
+  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 = [ 
+  ICON_TAGS = [
     "aeroway", "amenity", "barrier", "building", "highway", "historic", "landuse",
     "leisure", "man_made", "natural", "railway", "shop", "tourism", "waterway"
   ]
@@ -97,25 +110,34 @@ private
     if key == "wikipedia"
       # This regex should match Wikipedia language codes, everything
       # from de to zh-classical
-      if value =~ /^([a-z-]{2,12}):(.+)$/
+      if value =~ /^([a-z-]{2,12}):(.+)$/i
         # Value is <lang>:<title> so split it up
+        # Note that value is always left as-is, see: https://trac.openstreetmap.org/ticket/4315
         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
+      # Language is in the key, so assume value is the title
       lang = $1
     else
       # Not a wikipedia key!
       return nil
     end
 
+    if value =~ /^([^#]*)(#.*)/ then
+      # Contains a reference to a section of the wikipedia article
+      # Must break it up to correctly build the url
+      value = $1
+      section = $2
+    else
+      section = ""
+    end
+
     return {
-      :url => "http://#{lang}.wikipedia.org/wiki/#{value}?uselang=#{I18n.locale}",
-      :title => value
+      :url => "http://#{lang}.wikipedia.org/wiki/#{value}?uselang=#{I18n.locale}#{section}",
+      :title => value + section
     }
   end
 end