From: Tom Hughes Date: Thu, 22 Apr 2010 08:09:36 +0000 (+0100) Subject: Merge remote branch 'avar/avar/browse-pages-link-to-wikipedia' X-Git-Tag: live~6319^2~6 X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/c9a3091ca8304a5695102d671fdb5546c952b946?hp=3008963a4ba857efb808fa1d0a02cbac992a412c Merge remote branch 'avar/avar/browse-pages-link-to-wikipedia' --- diff --git a/app/helpers/browse_helper.rb b/app/helpers/browse_helper.rb index 1d0b02df0..07dd866ba 100644 --- 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.wiki_link.wikipedia', :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) @@ -45,4 +47,34 @@ private return url end + + def wikipedia_link(key, value) + # English Wikipedia by default + lang = 'en' + + if key == 'wikipedia' or key =~ /^wikipedia:(\S+)$/ + mylang = $1 + + # Some k/v's are wikipedia=http://en.wikipedia.org/wiki/Full%20URL + return nil if value =~ /^http:\/\// + + if mylang + lang = mylang + # This regex should match Wikipedia language codes, everything + # from de to zh-classical + elsif value =~ /^([a-z-]{2,12}):(.+)$/ + lang = $1 + # Don't display e.g. "en:Foobar" as the title, just "Foobar" + value = $2 + end + + locale = I18n.locale.to_s + return { + 'url' => "http://#{lang}.wikipedia.org/wiki/#{value}?uselang=#{locale}", + 'title' => value + } + else + return nil + end + end end diff --git a/config/locales/en.yml b/config/locales/en.yml index 7b9720fbd..4883b9b07 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -236,6 +236,7 @@ en: wiki_link: key: "The wiki description page for the {{key}} tag" tag: "The wiki description page for the {{key}}={{value}} tag" + wikipedia: "The {{page}} article on Wikipedia" way_details: nodes: "Nodes:" part_of: "Part of:"