Merge remote-tracking branch 'openstreetmap/pull/1375'

[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..038ca564b36ba989ffa35e730bf1f279b6801b5a 100644 (file)
--- a/app/views/notes/_note.rss.builder
+++ b/app/views/notes/_note.rss.builder
@@ -1,19 +1,20 @@
 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("note.rss.closed", :place => location)
   elsif note.comments.length > 1
-    xml.title t('note.rss.comment', :place => location_string)
+    xml.title t("note.rss.commented", :place => location)
   else
-    xml.title t('note.rss.new', :place => location_string)
+    xml.title t("note.rss.opened", :place => location)
   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.description render(:partial => "description", :object => note, :formats => [:html])
+
+  xml.dc :creator, note.author.display_name if note.author
+
   xml.pubDate note.updated_at.to_s(:rfc822)
   xml.geo :lat, note.lat
   xml.geo :long, note.lon