X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/0a3aba7f891ba55a5500f02907cec15d44554eae..4afcc5404f642bcb16d71daf27184d9f816f0476:/app/views/notes/feed.rss.builder diff --git a/app/views/notes/feed.rss.builder b/app/views/notes/feed.rss.builder index ba0e3fbfe..e663d94a6 100644 --- a/app/views/notes/feed.rss.builder +++ b/app/views/notes/feed.rss.builder @@ -1,6 +1,7 @@ xml.instruct! xml.rss("version" => "2.0", + "xmlns:dc" => "http://purl.org/dc/elements/1.1/", "xmlns:geo" => "http://www.w3.org/2003/01/geo/wgs84_pos#", "xmlns:georss" => "http://www.georss.org/georss") do xml.channel do @@ -9,36 +10,22 @@ xml.rss("version" => "2.0", xml.link url_for(:controller => "site", :action => "index", :only_path => false) @comments.each do |comment| - location_string = Rails.cache.fetch("location_description_#{comment.note.lat}_#{comment.note.lon}_#{locale}") do - describe_location comment.note.lat, comment.note.lon, 14, locale - end + location = describe_location(comment.note.lat, comment.note.lon, 14, locale) + xml.item do - if comment.event == "closed" - xml.title t('note.rss.closed', :place => location_string) - elsif comment.event == "commented" - xml.title t('note.rss.comment', :place => location_string) - elsif comment.event == "opened" - xml.title t('note.rss.new', :place => location_string) - else - xml.title "unknown event" - end + xml.title t("note.rss.#{comment.event}", :place => location) - xml.link url_for(:controller => "browse", :action => "note", :id => comment.note.id, :only_path => false) - xml.guid url_for(:controller => "browse", :action => "note", :id => comment.note.id, :only_path => false) + xml.link url_for(:controller => "browse", :action => "note", :id => comment.note.id, :anchor => "c#{comment.id}", :only_path => false) + xml.guid url_for(:controller => "browse", :action => "note", :id => comment.note.id, :anchor => "c#{comment.id}", :only_path => false) - description_text = "" - - if comment.event == "commented" and not comment.nil? - description_text += "Comment:
" - description_text += comment.body.to_html - description_text += "
" + xml.description do + xml.cdata! render(:partial => "entry", :object => comment, :formats => [ :html ]) end - description_text += "Full note:
" - description_text += comment.note.flatten_comment("
", comment.created_at) + if comment.author + xml.dc :creator, comment.author.display_name + end - xml.description description_text - xml.author comment.author_name xml.pubDate comment.created_at.to_s(:rfc822) xml.geo :lat, comment.note.lat xml.geo :long, comment.note.lon