Rework the generation of descriptions in the notes RSS feed

[rails.git] / app / views / notes / feed.rss.builder

diff --git a/app/views/notes/feed.rss.builder b/app/views/notes/feed.rss.builder
index d22d673119a3d875e0a9819c9ceddd660802d2b5..f17be09cbf4b34d2d8fc81a6d9620905427017cc 100644 (file)
--- a/app/views/notes/feed.rss.builder
+++ b/app/views/notes/feed.rss.builder
@@ -9,13 +9,15 @@ xml.rss("version" => "2.0",
     xml.link url_for(:controller => "site", :action => "index", :only_path => false)
 
     @comments.each do |comment|
+      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 => comment.note.nearby_place)  
+          xml.title t('note.rss.closed', :place => location)
         elsif comment.event == "commented"
-          xml.title t('note.rss.comment', :place => comment.note.nearby_place)
+          xml.title t('note.rss.comment', :place => location)
         elsif comment.event == "opened"
-          xml.title t('note.rss.new', :place => comment.note.nearby_place)
+          xml.title t('note.rss.new', :place => location)
         else
           xml.title "unknown event"
         end
@@ -23,19 +25,12 @@ xml.rss("version" => "2.0",
         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)
 
-        description_text = ""
+        xml.description render(:partial => "entry", :object => comment, :formats => [ :html ])
 
-        if comment.event == "commented" and not comment.nil?
-          description_text += "<b>Comment:</b><br>"
-          description_text += htmlize(comment.body)
-          description_text += "<br>"
+        if comment.author
+          xml.author comment.author.display_name
         end
 
-        description_text += "<b>Full note:</b><br>"
-        description_text += comment.note.flatten_comment("<br>", comment.created_at)
-
-        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