Refactor signup form to remove tables

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

diff --git a/app/helpers/browse_helper.rb b/app/helpers/browse_helper.rb
index 0b72040a3a6e80b70a659e2bebdd20cd03334e23..c4e4d425a5ef997a97dbb84cc2d75eeac53a5cac 100644 (file)
--- a/app/helpers/browse_helper.rb
+++ b/app/helpers/browse_helper.rb
@@ -13,14 +13,17 @@ module BrowseHelper
     if version
       name = t 'printable_name.with_version', :id => name, :version => object.version.to_s
     end
     if version
       name = t 'printable_name.with_version', :id => name, :version => object.version.to_s
     end

-    # stop here if redacted to avoid giving away redacted version tags.
-    return name if object.redacted?

 
 

-    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
+    # 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}"
+        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
+      end

     end
     end

+

     return name
   end
 
     return name
   end
 


@@ -60,7 +63,7 @@ module BrowseHelper
 
 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"
   ]


@@ -94,10 +97,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'