Improve formatting of note descriptions in GPX and RSS responses

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

diff --git a/app/helpers/browse_helper.rb b/app/helpers/browse_helper.rb
index 090d1e9c3a13cd7c275bef2dfa4b20ab2ab16e22..a41b39a3deac07a9c7165648b1946a885b1bae18 100644 (file)
--- a/app/helpers/browse_helper.rb
+++ b/app/helpers/browse_helper.rb
@@ -56,9 +56,15 @@ private
   def wiki_link(type, lookup)
     locale = I18n.locale.to_s
 
   def wiki_link(type, lookup)
     locale = I18n.locale.to_s
 

-    if page = WIKI_PAGES[locale][type][lookup] rescue nil
+    # update-wiki-pages does s/ /_/g on keys before saving them, we
+    # have to replace spaces with underscore so we'll link
+    # e.g. `source=Isle of Man Government aerial imagery (2001)' to
+    # the correct page.
+    lookup_us = lookup.tr(" ", "_")
+
+    if page = WIKI_PAGES[locale][type][lookup_us] rescue nil

       url = "http://wiki.openstreetmap.org/wiki/#{page}?uselang=#{locale}"
       url = "http://wiki.openstreetmap.org/wiki/#{page}?uselang=#{locale}"

-    elsif page = WIKI_PAGES["en"][type][lookup] rescue nil
+    elsif page = WIKI_PAGES["en"][type][lookup_us] rescue nil

       url = "http://wiki.openstreetmap.org/wiki/#{page}?uselang=#{locale}"
     end
 
       url = "http://wiki.openstreetmap.org/wiki/#{page}?uselang=#{locale}"
     end