Update bundle

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

diff --git a/app/views/notes/_note.rss.builder b/app/views/notes/_note.rss.builder
index fbd217beb75f94e1b9801ef724cac75aadb675fc..a095b636d9ed45a8bf907a7731f140597168e36f 100644 (file)
--- a/app/views/notes/_note.rss.builder
+++ b/app/views/notes/_note.rss.builder
@@ -1,12 +1,12 @@
 xml.item do
   location = describe_location(note.lat, note.lon, 14, locale)
 
 xml.item do
   location = describe_location(note.lat, note.lon, 14, locale)
 

-  if note.status == "closed"
+  if note.closed?

     xml.title t('note.rss.closed', :place => location)
   elsif note.comments.length > 1
     xml.title t('note.rss.closed', :place => location)
   elsif note.comments.length > 1

-    xml.title t('note.rss.comment', :place => location)
+    xml.title t('note.rss.commented', :place => location)

   else
   else

-    xml.title t('note.rss.new', :place => location)
+    xml.title t('note.rss.opened', :place => location)

   end
 
   xml.link browse_note_url(note)
   end
 
   xml.link browse_note_url(note)


@@ -14,7 +14,7 @@ xml.item do
   xml.description render(:partial => "description", :object => note, :formats => [ :html ])
 
   if note.author
   xml.description render(:partial => "description", :object => note, :formats => [ :html ])
 
   if note.author

-    xml.author note.author_display_name
+    xml.author note.author.display_name

   end
 
   xml.pubDate note.updated_at.to_s(:rfc822)
   end
 
   xml.pubDate note.updated_at.to_s(:rfc822)