Merge branch 'pull/1765'

[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 90d575725615af3b4a96783537081753c328db2b..38c42f1ec4786de0dba3fd82469903ec8d88fca0 100644 (file)
--- a/app/views/notes/_note.rss.builder
+++ b/app/views/notes/_note.rss.builder
@@ -1,17 +1,21 @@
 xml.item do
 xml.item do

-  if note.status == "closed"
-    xml.title t('note.rss.closed', :place => note.nearby_place)        
+  location = describe_location(note.lat, note.lon, 14, locale)
+
+  if note.closed?
+    xml.title t("note.rss.closed", :place => location)

   elsif note.comments.length > 1
   elsif note.comments.length > 1

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

   else
   else

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

   end
 
   end
 

-  xml.link url_for(:controller => "browse", :action => "note", :id => note.id, :only_path => false)
-  xml.guid url_for(:controller => "note", :action => "read", :id => note.id, :only_path => false)
-  xml.description render(:partial => "description", :object => note, :formats => [ :html ])
-  xml.author note.author_name
-  xml.pubDate note.updated_at.to_s(:rfc822)
+  xml.link browse_note_url(note)
+  xml.guid note_url(note)
+  xml.description render(:partial => "description", :object => note, :formats => [:html])
+
+  xml.dc :creator, note.author.display_name if note.author
+
+  xml.pubDate note.created_at.to_s(:rfc822)

   xml.geo :lat, note.lat
   xml.geo :long, note.lon
   xml.georss :point, "#{note.lat} #{note.lon}"
   xml.geo :lat, note.lat
   xml.geo :long, note.lon
   xml.georss :point, "#{note.lat} #{note.lon}"