X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/10cde3bb926bbbb5e90de0aceb0dd872b20a6089..3251cdf5d6d4ce51e52d96f52f266ab37f1fa695:/app/helpers/browse_helper.rb diff --git a/app/helpers/browse_helper.rb b/app/helpers/browse_helper.rb index 096f74e2f..8a0721c58 100644 --- a/app/helpers/browse_helper.rb +++ b/app/helpers/browse_helper.rb @@ -72,9 +72,9 @@ module BrowseHelper elsif wdt = wikidata_links(key, value) # IMPORTANT: Note that wikidata_links() returns an array of hashes, unlike for example wikipedia_link(), # which just returns one such hash. - wdt.map{|w| - link_to(w[:title], w[:url], :title => t('browse.tag_details.wikidata_link', :page => w[:title].strip)) - }.join(";").html_safe + wdt.map do |w| + link_to(w[:title], w[:url], :title => t("browse.tag_details.wikidata_link", :page => w[:title].strip)) + end.join(";").html_safe 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 url = telephone_link(key, value) @@ -169,16 +169,14 @@ module BrowseHelper :url => "//www.wikidata.org/wiki/#{value}?uselang=#{I18n.locale}", :title => value }] - elsif ( - # Key has to be one of the accepted wikidata-tags - key =~ /(architect|artist|brand|operator|subject):wikidata/ && - # Value has to be a semicolon-separated list of wikidata-IDs (whitespaces allowed before and after semicolons) - value =~ /^[Qq][1-9][0-9]*(\s*;\s*[Qq][1-9][0-9]*)*$/ - ) + # Key has to be one of the accepted wikidata-tags + elsif key =~ /(architect|artist|brand|operator|subject):wikidata/ && + # Value has to be a semicolon-separated list of wikidata-IDs (whitespaces allowed before and after semicolons) + value =~ /^[Qq][1-9][0-9]*(\s*;\s*[Qq][1-9][0-9]*)*$/ # Splitting at every semicolon to get a separate hash for each wikidata-ID - return value.split(";").map { |id| - id = {:title => id, :url => "//www.wikidata.org/wiki/#{id.strip}?uselang=#{I18n.locale}" } - } + return value.split(";").map do |id| + { :title => id, :url => "//www.wikidata.org/wiki/#{id.strip}?uselang=#{I18n.locale}" } + end end nil end