Merge branch 'master' into notes

[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..4733c1bad77864377814f32139676c1ab27175e9 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|
     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.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"
         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"
         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
         else
           xml.title "unknown event"
         end


@@ -27,7 +29,7 @@ xml.rss("version" => "2.0",
 
         if comment.event == "commented" and not comment.nil?
           description_text += "<b>Comment:</b><br>"
 
         if comment.event == "commented" and not comment.nil?
           description_text += "<b>Comment:</b><br>"

-          description_text += htmlize(comment.body)
+          description_text += comment.body.to_html

           description_text += "<br>"
         end
 
           description_text += "<br>"
         end
 


@@ -35,7 +37,11 @@ xml.rss("version" => "2.0",
         description_text += comment.note.flatten_comment("<br>", comment.created_at)
 
         xml.description description_text 
         description_text += comment.note.flatten_comment("<br>", comment.created_at)
 
         xml.description description_text 

-        xml.author comment.author_name
+
+        if comment.author
+          xml.author comment.author.display_name
+        end
+

         xml.pubDate comment.created_at.to_s(:rfc822)
         xml.geo :lat, comment.note.lat
         xml.geo :long, comment.note.lon
         xml.pubDate comment.created_at.to_s(:rfc822)
         xml.geo :lat, comment.note.lat
         xml.geo :long, comment.note.lon