Merge remote-tracking branch 'upstream/pull/5184'

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

diff --git a/app/views/api/notes/feed.rss.builder b/app/views/api/notes/feed.rss.builder
index 1b9e5b584ed90105b2ab4a19f090151dbeb9cba1..4103a20924e9ea6567162af5a8ff28077e1b00e3 100644 (file)
--- a/app/views/api/notes/feed.rss.builder
+++ b/app/views/api/notes/feed.rss.builder
@@ -6,7 +6,11 @@ xml.rss("version" => "2.0",
         "xmlns:georss" => "http://www.georss.org/georss") do
   xml.channel do
     xml.title t("api.notes.rss.title")
         "xmlns:georss" => "http://www.georss.org/georss") do
   xml.channel do
     xml.title t("api.notes.rss.title")

-    xml.description t("api.notes.rss.description_area", :min_lat => @min_lat, :min_lon => @min_lon, :max_lat => @max_lat, :max_lon => @max_lon)
+    if @min_lat.nil? && @min_lon.nil? && @max_lat.nil? && @max_lon.nil?
+      xml.description t("api.notes.rss.description_all")
+    else
+      xml.description t("api.notes.rss.description_area", :min_lat => @min_lat, :min_lon => @min_lon, :max_lat => @max_lat, :max_lon => @max_lon)
+    end

     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|


@@ -15,8 +19,8 @@ xml.rss("version" => "2.0",
       xml.item do
         xml.title t("api.notes.rss.#{comment.event}", :place => location)
 
       xml.item do
         xml.title t("api.notes.rss.#{comment.event}", :place => location)
 

-        xml.link url_for(:controller => "/browse", :action => "note", :id => comment.note.id, :anchor => "c#{comment.id}", :only_path => false)
-        xml.guid url_for(:controller => "/browse", :action => "note", :id => comment.note.id, :anchor => "c#{comment.id}", :only_path => false)
+        xml.link url_for(:controller => "/notes", :action => "show", :id => comment.note.id, :anchor => "c#{comment.id}", :only_path => false)
+        xml.guid url_for(:controller => "/notes", :action => "show", :id => comment.note.id, :anchor => "c#{comment.id}", :only_path => false)

 
         xml.description do
           xml.cdata! render(:partial => "entry", :object => comment, :formats => [:html])
 
         xml.description do
           xml.cdata! render(:partial => "entry", :object => comment, :formats => [:html])


@@ -24,7 +28,7 @@ xml.rss("version" => "2.0",
 
         xml.dc :creator, comment.author.display_name if comment.author
 
 
         xml.dc :creator, comment.author.display_name if comment.author
 

-        xml.pubDate comment.created_at.to_s(:rfc822)
+        xml.pubDate comment.created_at.to_fs(:rfc822)

         xml.geo :lat, comment.note.lat
         xml.geo :long, comment.note.lon
         xml.georss :point, "#{comment.note.lat} #{comment.note.lon}"
         xml.geo :lat, comment.note.lat
         xml.geo :long, comment.note.lon
         xml.georss :point, "#{comment.note.lat} #{comment.note.lon}"