X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/c24c2e481cc6d27e76274ed4e32668a4690a7788..152414861caa30e9217e3451caabd5a2b983ce2b:/app/helpers/browse_tags_helper.rb diff --git a/app/helpers/browse_tags_helper.rb b/app/helpers/browse_tags_helper.rb index 3f720d0e9..0784d03ca 100644 --- a/app/helpers/browse_tags_helper.rb +++ b/app/helpers/browse_tags_helper.rb @@ -22,7 +22,7 @@ module BrowseTagsHelper elsif url = wiki_link("tag", "#{key}=#{value}") link_to h(value), url, :title => t("browse.tag_details.wiki_link.tag", :key => key, :value => value) elsif email = email_link(key, value) - link_to(h(email[:email]), email[:url], :title => t("browse.tag_details.email_link", :email => email[:email])) + mail_to(email, :title => t("browse.tag_details.email_link", :email => email)) elsif phones = telephone_links(key, value) # similarly, telephone_links() returns an array of phone numbers phones = phones.map do |p| @@ -47,11 +47,10 @@ module BrowseTagsHelper # the correct page. lookup_us = lookup.tr(" ", "_") - if page = WIKI_PAGES.dig(locale, type, lookup_us) - url = "https://wiki.openstreetmap.org/wiki/#{page}?uselang=#{locale}" - elsif page = WIKI_PAGES.dig("en", type, lookup_us) - url = "https://wiki.openstreetmap.org/wiki/#{page}?uselang=#{locale}" - end + page = WIKI_PAGES.dig(locale, type, lookup_us) || + WIKI_PAGES.dig("en", type, lookup_us) + + url = "https://wiki.openstreetmap.org/wiki/#{page}?uselang=#{locale}" if page url end @@ -60,7 +59,8 @@ module BrowseTagsHelper # Some k/v's are wikipedia=http://en.wikipedia.org/wiki/Full%20URL return nil if %r{^https?://}.match?(value) - if key == "wikipedia" + case key + when "wikipedia" # This regex should match Wikipedia language codes, everything # from de to zh-classical lang = if value =~ /^([a-z-]{2,12}):(.+)$/i @@ -71,7 +71,7 @@ module BrowseTagsHelper # Value is