X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/0d3a9ed9cb47ce3b89ea9eaffbb589f9a9ff6d22..0a3aba7f891ba55a5500f02907cec15d44554eae:/app/views/notes/_note.rss.builder

diff --git a/app/views/notes/_note.rss.builder b/app/views/notes/_note.rss.builder
index 90d575725..efdae52bb 100644
--- a/app/views/notes/_note.rss.builder
+++ b/app/views/notes/_note.rss.builder
@@ -1,16 +1,19 @@
 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 => note.nearby_place)	
+    xml.title t('note.rss.closed', :place => location_string)	
   elsif note.comments.length > 1
-    xml.title t('note.rss.comment', :place => note.nearby_place)
+    xml.title t('note.rss.comment', :place => location_string)
   else
-    xml.title t('note.rss.new', :place => note.nearby_place)
+    xml.title t('note.rss.new', :place => location_string)
   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.link browse_note_url(note)
+  xml.guid note_url(note)
   xml.description render(:partial => "description", :object => note, :formats => [ :html ])
-  xml.author note.author_name
+  xml.author note.comments.first.author_name
   xml.pubDate note.updated_at.to_s(:rfc822)
   xml.geo :lat, note.lat
   xml.geo :long, note.lon