X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/3988940e3ce8044bf6aa9e8f02eb080df4dedd83..a83030dab7512c4b2848e777f7a7dbff456774b3:/app/helpers/browse_helper.rb diff --git a/app/helpers/browse_helper.rb b/app/helpers/browse_helper.rb index c2e974e93..b90e27f85 100644 --- a/app/helpers/browse_helper.rb +++ b/app/helpers/browse_helper.rb @@ -8,18 +8,14 @@ module BrowseHelper 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 - end + name = t "printable_name.with_version", :id => name, :version => object.version.to_s if version # 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 - while locale =~ /-[^-]+/ && !object.tags.include?("name:#{I18n.locale}") - locale = locale.sub(/-[^-]+/, "") - end + locale = locale.sub(/-[^-]+/, "") while locale =~ /-[^-]+/ && !object.tags.include?("name:#{I18n.locale}") 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)