X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/d8cf49f0d7f0006bb8b5ccb16d3d236069e6821a..873c1cb84e2fe475bc4ff566d71929fdcc35787d:/app/helpers/browse_helper.rb?ds=sidebyside diff --git a/app/helpers/browse_helper.rb b/app/helpers/browse_helper.rb index b3145ebce..b192a63d5 100644 --- a/app/helpers/browse_helper.rb +++ b/app/helpers/browse_helper.rb @@ -24,11 +24,16 @@ module BrowseHelper end def link_class(type, object) + classes = [ type ] + if object.redacted? - type + " deleted" + classes << "deleted" else - type + " " + h(icon_tags(object).join(' ')) + (object.visible == false ? ' deleted' : '') + classes += icon_tags(object).flatten.map { |t| h(t) } + classes << "deleted" unless object.visible? end + + classes.join(" ") end def link_title(object) @@ -59,10 +64,10 @@ module BrowseHelper def type_and_paginated_count(type, pages) if pages.page_count == 1 - t "browse.changeset_details.#{type}", + t "browse.changeset.#{type}", :count => pages.item_count else - t "browse.changeset_details.#{type}_paginated", + t "browse.changeset.#{type}_paginated", :x => pages.current_page.first_item, :y => pages.current_page.last_item, :count => pages.item_count @@ -114,16 +119,25 @@ private lang = 'en' end elsif key =~ /^wikipedia:(\S+)$/ - # Language is in the key, so assume value is a simple title + # Language is in the key, so assume value is the title lang = $1 else # Not a wikipedia key! return nil end + if value =~ /^([^#]*)(#.*)/ then + # Contains a reference to a section of the wikipedia article + # Must break it up to correctly build the url + value = $1 + section = $2 + else + section = "" + end + return { - :url => "http://#{lang}.wikipedia.org/wiki/#{value}?uselang=#{I18n.locale}", - :title => value + :url => "http://#{lang}.wikipedia.org/wiki/#{value}?uselang=#{I18n.locale}#{section}", + :title => value + section } end end