Fix stubbing of hostip requests

[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 efdae52bb5365e79e31d41c406cb6cbc7947d18f..9c72b8a5d42c15cd2e30ca248f659852be0c922b 100644 (file)
--- a/app/views/notes/_note.rss.builder
+++ b/app/views/notes/_note.rss.builder
@@ -1,20 +1,21 @@
 xml.item do
 xml.item do

-  location_string = Rails.cache.fetch("location_description_#{note.lat}_#{note.lon}_#{locale}") do
-    describe_location note.lat, note.lon, 14, locale
-  end 
-  if note.status == "closed"
-    xml.title t('note.rss.closed', :place => location_string)  
+  location = describe_location(note.lat, note.lon, 14, locale)
+
+  if note.closed?
+    xml.title t("notes.rss.closed", :place => location)

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

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

   else
   else

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

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

-  xml.description render(:partial => "description", :object => note, :formats => [ :html ])
-  xml.author note.comments.first.author_name
-  xml.pubDate note.updated_at.to_s(:rfc822)
+  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}"