Improve the browse helper code use to generate wiki links

diff --git a/app/helpers/browse_helper.rb b/app/helpers/browse_helper.rb
index 48dd590a20faa16d05c2dddc1cd6609ead18baab..6ec3fb591c017d1d3848c9259b9874c468781be4 100644 (file)
--- a/app/helpers/browse_helper.rb
+++ b/app/helpers/browse_helper.rb
@@ -16,41 +16,34 @@ module BrowseHelper
     return name
   end
 
     return name
   end
 

-  def wiki_link(type, key, tag)
-    wiki_data = YAML.load_file("#{RAILS_ROOT}/config/wiki-tag-and-key-description.yml")
-    my_locale = I18n.locale.to_s
-
-    if type == "key"
-      ret = key
-      lookup = key
+  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)

     else
     else

-      ret = tag
-      lookup = key + "=" + tag
+      h(key)

     end
     end

+  end

 
 

-    # Try our native language
-    has_primary = wiki_data[my_locale][type][lookup] rescue false
-    if has_primary
-      ret = wikify(type, key, tag, lookup, wiki_data[my_locale][type][lookup])
+  def format_value(key, value)
+    if url = wiki_link("tag", "#{key}=#{value}")
+      link_to h(value), url, :title => t('browse.tag_details.wiki_link.tag', :key => key, :value => value)

     else
     else

-      # Fall back on English
-      has_fallback = wiki_data["en"][type][lookup] rescue false
-      if has_fallback
-        ret = wikify(type, key, tag, lookup, wiki_data["en"][type][lookup])
-      end
+      linkify h(value)

     end
     end

-
-    return ret

   end
 
   end
 

-  def wikify(type, key, tag, text, wiki)
-    my_locale = I18n.locale
-    url = "http://wiki.openstreetmap.org/wiki/#{wiki}?uselang=#{my_locale}"
-    
-    if type == "key"
-      return '<a href="' + url + '" title="' + h(t('browse.tag_details.wiki_link.key', :key => key)) + '">' + h(text) + '</a>'
-    else
-      return '<a href="' + url + '" title="' + h(t('browse.tag_details.wiki_link.tag', :key => key, :value => tag)) + '">' + h(tag) + '</a>'
+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
+      url = "http://wiki.openstreetmap.org/wiki/#{page}?uselang=#{locale}"
+    elsif page = wiki_data["en"][type][lookup] rescue nil
+      url = "http://wiki.openstreetmap.org/wiki/#{page}?uselang=#{locale}"

     end
     end

+
+    return url

   end
 end
   end
 end

diff --git a/app/views/browse/_tag.html.erb b/app/views/browse/_tag.html.erb
index 4096873da74e1a219983b009efa414da180b76f6..2eadad4f2db4a99bbb90cbb57f2134aa20bfb06f 100644 (file)
--- a/app/views/browse/_tag.html.erb
+++ b/app/views/browse/_tag.html.erb
@@ -1,3 +1,3 @@
 <tr>
 <tr>

-  <td><%= wiki_link("key", h(tag[0]), nil) %> = <%= wiki_link("tag", h(tag[0]), auto_link(h(tag[1]))) %></td>
+  <td><%= format_key(tag[0]) %> = <%= format_value(tag[0], tag[1]) %></td>

 </tr> 
 </tr> 

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 17bae6c574936f5ed724c2d2c6da1977639421bc..7b9720fbdcbb1c469b7e6ac742d5b303dfd69384 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -234,7 +234,7 @@ en:
     tag_details:
       tags: "Tags:"
       wiki_link:
     tag_details:
       tags: "Tags:"
       wiki_link:

-        key: "The wiki description page for the {{key}}=* tag"
+        key: "The wiki description page for the {{key}} tag"

         tag: "The wiki description page for the {{key}}={{value}} tag"
     way_details:
       nodes: "Nodes:"
         tag: "The wiki description page for the {{key}}={{value}} tag"
     way_details:
       nodes: "Nodes:"