X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/46c3c826c4c0f1987f616b287a06bf9412c184be..a8020dc47555d4520b9218916693ca691ae7dbe1:/app/helpers/browse_helper.rb?ds=sidebyside diff --git a/app/helpers/browse_helper.rb b/app/helpers/browse_helper.rb index 1fce5f0b3..0f533770b 100644 --- a/app/helpers/browse_helper.rb +++ b/app/helpers/browse_helper.rb @@ -1,7 +1,5 @@ -require "cgi" - module BrowseHelper - def printable_name(object, version = false) + def printable_name(object, version: false) id = if object.id.is_a?(Array) object.id[0] else @@ -13,16 +11,16 @@ module BrowseHelper # don't look at object tags if redacted, so as to avoid giving # away redacted version tag information. unless object.redacted? - locale = I18n.locale.to_s + available_locales = Locale.list(name_locales(object)) - locale = locale.sub(/-[^-]+/, "") while locale =~ /-[^-]+/ && !object.tags.include?("name:#{I18n.locale}") + locale = available_locales.preferred(preferred_languages, :default => nil) if object.tags.include? "name:#{locale}" - name = t "printable_name.with_name_html", :name => content_tag(:bdi, object.tags["name:#{locale}"].to_s), :id => content_tag(:bdi, name) + name = t "printable_name.with_name_html", :name => tag.bdi(object.tags["name:#{locale}"].to_s), :id => tag.bdi(name) elsif object.tags.include? "name" - name = t "printable_name.with_name_html", :name => content_tag(:bdi, object.tags["name"].to_s), :id => content_tag(:bdi, name) + name = t "printable_name.with_name_html", :name => tag.bdi(object.tags["name"].to_s), :id => tag.bdi(name) elsif object.tags.include? "ref" - name = t "printable_name.with_name_html", :name => content_tag(:bdi, object.tags["ref"].to_s), :id => content_tag(:bdi, name) + name = t "printable_name.with_name_html", :name => tag.bdi(object.tags["ref"].to_s), :id => tag.bdi(name) end end @@ -46,7 +44,7 @@ module BrowseHelper if object.redacted? "" else - h(icon_tags(object).map { |k, v| k + "=" + v }.to_sentence) + h(icon_tags(object).map { |k, v| "#{k}=#{v}" }.to_sentence) end end @@ -54,35 +52,6 @@ module BrowseHelper "nofollow" if object.tags.empty? end - 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 - h(key) - end - end - - def format_value(key, value) - if wp = wikipedia_link(key, value) - link_to h(wp[:title]), wp[:url], :title => t("browse.tag_details.wikipedia_link", :page => wp[:title]) - 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 = wdt.map do |w| - link_to(w[:title], w[:url], :title => t("browse.tag_details.wikidata_link", :page => w[:title].strip)) - end - safe_join(wdt, ";") - 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) - link_to h(value), url, :title => t("browse.tag_details.telephone_link", :phone_number => value) - elsif colour_value = colour_preview(key, value) - %(
#{h(value)} ).html_safe # rubocop:disable Rails/OutputSafety - else - linkify h(value) - end - end - def type_and_paginated_count(type, pages) if pages.page_count == 1 t "browse.changeset.#{type}", @@ -103,103 +72,7 @@ module BrowseHelper object.tags.find_all { |k, _v| ICON_TAGS.include? k }.sort end - def wiki_link(type, lookup) - locale = I18n.locale.to_s - - # 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.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 - - url - end - - def wikipedia_link(key, value) - # Some k/v's are wikipedia=http://en.wikipedia.org/wiki/Full%20URL - return nil if value =~ %r{^https?://} - - if key == "wikipedia" - # This regex should match Wikipedia language codes, everything - # from de to zh-classical - lang = if value =~ /^([a-z-]{2,12}):(.+)$/i - # Value is