Merge branch 'master' into notes

[rails.git] / app / views / notes / feed.rss.builder

diff --git a/app/views/notes/feed.rss.builder b/app/views/notes/feed.rss.builder
index ba0e3fbfecdfa5ca6149358e3f4dbe8f961124f6..4733c1bad77864377814f32139676c1ab27175e9 100644 (file)
--- a/app/views/notes/feed.rss.builder
+++ b/app/views/notes/feed.rss.builder
@@ -9,16 +9,15 @@ xml.rss("version" => "2.0",
     xml.link url_for(:controller => "site", :action => "index", :only_path => false)
 
     @comments.each do |comment|
     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
+      location = describe_location(comment.note.lat, comment.note.lon, 14, locale)
+

       xml.item do
         if comment.event == "closed"
       xml.item do
         if comment.event == "closed"

-          xml.title t('note.rss.closed', :place => location_string)    
+          xml.title t('note.rss.closed', :place => location)

         elsif comment.event == "commented"
         elsif comment.event == "commented"

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

         elsif comment.event == "opened"
         elsif comment.event == "opened"

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

         else
           xml.title "unknown event"
         end
         else
           xml.title "unknown event"
         end


@@ -38,7 +37,11 @@ xml.rss("version" => "2.0",
         description_text += comment.note.flatten_comment("<br>", comment.created_at)
 
         xml.description description_text 
         description_text += comment.note.flatten_comment("<br>", comment.created_at)
 
         xml.description description_text 

-        xml.author comment.author_name
+
+        if comment.author
+          xml.author comment.author.display_name
+        end
+

         xml.pubDate comment.created_at.to_s(:rfc822)
         xml.geo :lat, comment.note.lat
         xml.geo :long, comment.note.lon
         xml.pubDate comment.created_at.to_s(:rfc822)
         xml.geo :lat, comment.note.lat
         xml.geo :long, comment.note.lon