Improve layout of data browser pages

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

diff --git a/app/helpers/browse_helper.rb b/app/helpers/browse_helper.rb
index 6ec3fb591c017d1d3848c9259b9874c468781be4..d2c2b5807c97f6ee6494fec99dbfdc4240bd4f53 100644 (file)
--- a/app/helpers/browse_helper.rb
+++ b/app/helpers/browse_helper.rb
@@ -25,7 +25,9 @@ module BrowseHelper
   end
 
   def format_value(key, value)
-    if url = wiki_link("tag", "#{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)
@@ -35,15 +37,43 @@ module BrowseHelper
 private
 
   def wiki_link(type, lookup)
-    wiki_data = YAML.load_file("#{RAILS_ROOT}/config/wiki-tag-and-key-description.yml")
     locale = I18n.locale.to_s
 
-    if page = wiki_data[locale][type][lookup] rescue nil
+    if page = WIKI_PAGES[locale][type][lookup] rescue nil
       url = "http://wiki.openstreetmap.org/wiki/#{page}?uselang=#{locale}"
-    elsif page = wiki_data["en"][type][lookup] rescue nil
+    elsif page = WIKI_PAGES["en"][type][lookup] rescue nil
       url = "http://wiki.openstreetmap.org/wiki/#{page}?uselang=#{locale}"
     end
 
     return url
   end
+
+  def wikipedia_link(key, value)
+    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
+
+    # Some k/v's are wikipedia=http://en.wikipedia.org/wiki/Full%20URL
+    return nil if value =~ /^http:\/\//
+
+    return {
+      :url => "http://#{lang}.wikipedia.org/wiki/#{value}?uselang=#{I18n.locale}",
+      :title => value
+    }
+  end
 end