X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/18b8fc60bb08b2df03fa74537ea51cdd7fcfd39a..2ada0591b8d348459dc31f4279e27b21a773c061:/app/helpers/browse_helper.rb diff --git a/app/helpers/browse_helper.rb b/app/helpers/browse_helper.rb index 6c9e108dc..494232744 100644 --- a/app/helpers/browse_helper.rb +++ b/app/helpers/browse_helper.rb @@ -2,11 +2,11 @@ require "uri" module BrowseHelper def printable_name(object, version = false) - if object.id.is_a?(Array) - id = object.id[0] - else - id = object.id - end + id = if object.id.is_a?(Array) + object.id[0] + else + object.id + end name = t "printable_name.with_id", :id => id.to_s if version name = t "printable_name.with_version", :id => name, :version => object.version.to_s @@ -25,6 +25,8 @@ module BrowseHelper name = t "printable_name.with_name_html", :name => content_tag(:bdi, object.tags["name:#{locale}"].to_s), :id => content_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) + 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) end end @@ -92,7 +94,7 @@ module BrowseHelper private - ICON_TAGS = %w(aeroway amenity barrier building highway historic landuse leisure man_made natural railway shop tourism waterway) + ICON_TAGS = %w(aeroway amenity barrier building highway historic landuse leisure man_made natural railway shop tourism waterway).freeze def icon_tags(object) object.tags.find_all { |k, _v| ICON_TAGS.include? k }.sort @@ -123,14 +125,14 @@ module BrowseHelper if key == "wikipedia" # This regex should match Wikipedia language codes, everything # from de to zh-classical - if value =~ /^([a-z-]{2,12}):(.+)$/i - # Value is : so split it up - # Note that value is always left as-is, see: https://trac.openstreetmap.org/ticket/4315 - lang = $1 - else - # Value is <title> so default to English Wikipedia - lang = "en" - end + lang = if value =~ /^([a-z-]{2,12}):(.+)$/i + # Value is <lang>:<title> so split it up + # Note that value is always left as-is, see: https://trac.openstreetmap.org/ticket/4315 + $1 + else + # Value is <title> so default to English Wikipedia + "en" + end elsif key =~ /^wikipedia:(\S+)$/ # Language is in the key, so assume value is the title lang = $1