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

diff --git a/app/views/notes/feed.rss.builder b/app/views/notes/feed.rss.builder
index d22d67311..ba0e3fbfe 100644
--- a/app/views/notes/feed.rss.builder
+++ b/app/views/notes/feed.rss.builder
@@ -9,13 +9,16 @@ xml.rss("version" => "2.0",
     xml.link url_for(:controller => "site", :action => "index", :only_path => false)
 
     @comments.each do |comment|
+      location_string = Rails.cache.fetch("location_description_#{comment.note.lat}_#{comment.note.lon}_#{locale}") do
+        describe_location comment.note.lat, comment.note.lon, 14, locale
+      end
       xml.item do
         if comment.event == "closed"
-          xml.title t('note.rss.closed', :place => comment.note.nearby_place)	
+          xml.title t('note.rss.closed', :place => location_string)	
         elsif comment.event == "commented"
-          xml.title t('note.rss.comment', :place => comment.note.nearby_place)
+          xml.title t('note.rss.comment', :place => location_string)
         elsif comment.event == "opened"
-          xml.title t('note.rss.new', :place => comment.note.nearby_place)
+          xml.title t('note.rss.new', :place => location_string)
         else
           xml.title "unknown event"
         end
@@ -27,7 +30,7 @@ xml.rss("version" => "2.0",
 
         if comment.event == "commented" and not comment.nil?
           description_text += "<b>Comment:</b><br>"
-          description_text += htmlize(comment.body)
+          description_text += comment.body.to_html
           description_text += "<br>"
         end