X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/af217ca1403664255d9e116d8e504facb1bd57f8..8ba74c581dff4c66cbe07f94f4283298bb46f22c:/app/helpers/browse_helper.rb

diff --git a/app/helpers/browse_helper.rb b/app/helpers/browse_helper.rb
index 090d1e9c3..ebcd58dd0 100644
--- a/app/helpers/browse_helper.rb
+++ b/app/helpers/browse_helper.rb
@@ -4,7 +4,12 @@ module BrowseHelper
   end
 
   def printable_name(object, version=false)
-    name = t 'printable_name.with_id', :id => object.id.to_s
+    if object.id.is_a?(Array)
+      id = object.id[0]
+    else
+      id = object.id
+    end
+    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
     end
@@ -56,9 +61,15 @@ private
   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}"
-    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