X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/ef7f3d800cbdd49b692df10d312e5fd880e2e938..b40353b9b05350bccac09e136315f2fcb0093ca7:/app/helpers/browse_helper.rb

diff --git a/app/helpers/browse_helper.rb b/app/helpers/browse_helper.rb
index 45240e082..a2d0e440d 100644
--- a/app/helpers/browse_helper.rb
+++ b/app/helpers/browse_helper.rb
@@ -1,3 +1,5 @@
+require "uri"
+
 module BrowseHelper
   def printable_name(object, version = false)
     if object.id.is_a?(Array)
@@ -5,9 +7,9 @@ module BrowseHelper
     else
       id = object.id
     end
-    name = t 'printable_name.with_id', :id => id.to_s
+    name = t "printable_name.with_id", :id => id.to_s
     if version
-      name = t 'printable_name.with_version', :id => name, :version => object.version.to_s
+      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
@@ -20,9 +22,9 @@ module BrowseHelper
       end
 
       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)
+        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)
       end
     end
 
@@ -46,13 +48,13 @@ module BrowseHelper
     if object.redacted?
       ""
     else
-      h(icon_tags(object).map { |k, v| k + '=' + v }.to_sentence)
+      h(icon_tags(object).map { |k, v| k + "=" + v }.to_sentence)
     end
   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)
+      link_to h(key), url, :title => t("browse.tag_details.wiki_link.key", :key => key)
     else
       h(key)
     end
@@ -60,13 +62,13 @@ module BrowseHelper
 
   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])
+      link_to h(wp[:title]), wp[:url], :title => t("browse.tag_details.wikipedia_link", :page => wp[:title])
     elsif wdt = wikidata_link(key, value)
-      link_to h(wdt[:title]), wdt[:url], :title => t('browse.tag_details.wikidata_link', :page => wdt[:title])
+      link_to h(wdt[:title]), wdt[:url], :title => t("browse.tag_details.wikidata_link", :page => wdt[: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)
+      link_to h(value), url, :title => t("browse.tag_details.wiki_link.tag", :key => key, :value => value)
     elsif url = telephone_link(key, value)
-      link_to h(value), url, :title => t('browse.tag_details.telephone_link', :phone_number => value)
+      link_to h(value), url, :title => t("browse.tag_details.telephone_link", :phone_number => value)
     else
       linkify h(value)
     end
@@ -112,7 +114,7 @@ module BrowseHelper
 
   def wikipedia_link(key, value)
     # Some k/v's are wikipedia=http://en.wikipedia.org/wiki/Full%20URL
-    return nil if value =~ /^https?:\/\//
+    return nil if value =~ %r{^https?://}
 
     if key == "wikipedia"
       # This regex should match Wikipedia language codes, everything
@@ -123,7 +125,7 @@ module BrowseHelper
         lang  = $1
       else
         # Value is <title> so default to English Wikipedia
-        lang = 'en'
+        lang = "en"
       end
     elsif key =~ /^wikipedia:(\S+)$/
       # Language is in the key, so assume value is the title
@@ -133,17 +135,19 @@ module BrowseHelper
       return nil
     end
 
-    if value =~ /^([^#]*)(#.*)/
+    if value =~ /^([^#]*)#(.*)/
       # Contains a reference to a section of the wikipedia article
       # Must break it up to correctly build the url
       value = $1
-      section = $2
+      section = "#" + $2
+      encoded_section = "#" + URI.encode($2.gsub(" ", "_")).gsub("%3A", ":").gsub("%", ".")
     else
       section = ""
+      encoded_section = ""
     end
 
     {
-      :url => "http://#{lang}.wikipedia.org/wiki/#{value}?uselang=#{I18n.locale}#{section}",
+      :url => "http://#{lang}.wikipedia.org/wiki/#{value}?uselang=#{I18n.locale}#{encoded_section}",
       :title => value + section
     }
   end
@@ -160,12 +164,12 @@ module BrowseHelper
 
   def telephone_link(_key, value)
     # does it look like a phone number? eg "+1 (234) 567-8901 " ?
-    return nil unless value =~ /^\s*\+[\d\s\(\)\/\.-]{6,25}\s*$/
+    return nil unless value =~ %r{^\s*\+[\d\s\(\)/\.-]{6,25}\s*$}
 
     # remove all whitespace instead of encoding it http://tools.ietf.org/html/rfc3966#section-5.1.1
     # "+1 (234) 567-8901 " -> "+1(234)567-8901"
-    valueNoWhitespace = value.gsub(/\s+/, '')
+    value_no_whitespace = value.gsub(/\s+/, "")
 
-    "tel:#{valueNoWhitespace}"
+    "tel:#{value_no_whitespace}"
   end
 end