Revert user page to full width for now

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

diff --git a/app/helpers/browse_helper.rb b/app/helpers/browse_helper.rb
index ffc638cdf491a6c7a22d57f420568f0ed173faa7..cf13c27958943a6438b0fdcf99a947416667709a 100644 (file)
--- a/app/helpers/browse_helper.rb
+++ b/app/helpers/browse_helper.rb
@@ -1,8 +1,4 @@
 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)
     if object.id.is_a?(Array)
       id = object.id[0]
   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
 
       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}"
     # away redacted version tag information.
     unless object.redacted?
       if object.tags.include? "name:#{I18n.locale}"


@@ -61,9 +57,21 @@ module BrowseHelper
     end
   end
 
     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
 
 private
 

-  ICON_TAGS = [ 
+  ICON_TAGS = [

     "aeroway", "amenity", "barrier", "building", "highway", "historic", "landuse",
     "leisure", "man_made", "natural", "railway", "shop", "tourism", "waterway"
   ]
     "aeroway", "amenity", "barrier", "building", "highway", "historic", "landuse",
     "leisure", "man_made", "natural", "railway", "shop", "tourism", "waterway"
   ]


@@ -97,10 +105,10 @@ private
     if key == "wikipedia"
       # This regex should match Wikipedia language codes, everything
       # from de to zh-classical
     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
         # 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
         lang  = $1

-        value = $2

       else
         # Value is <title> so default to English Wikipedia
         lang = 'en'
       else
         # Value is <title> so default to English Wikipedia
         lang = 'en'