Merge branch 'master' into HEAD

[rails.git] / app / views / traces / georss.rss.builder

diff --git a/app/views/traces/georss.rss.builder b/app/views/traces/georss.rss.builder
index 66dad596da9e6f4bbb6678e906c07c9eb007cb23..991f74ebbf194b173f17b256615d74ae9f25868c 100644 (file)
--- a/app/views/traces/georss.rss.builder
+++ b/app/views/traces/georss.rss.builder
@@ -7,22 +7,22 @@ xml.rss("version" => "2.0",
   xml.channel do
     xml.title t(".title")
     xml.description t(".title")
-    xml.link url_for(:controller => :traces, :action => :list, :only_path => false)
+    xml.link url_for(:controller => :traces, :action => :index, :only_path => false)
 
     xml.image do
       xml.url image_url("mag_map-rss2.0.png")
       xml.title t(".title")
       xml.width 100
       xml.height 100
-      xml.link url_for(:controller => :traces, :action => :list, :only_path => false)
+      xml.link url_for(:controller => :traces, :action => :index, :only_path => false)
     end
 
     @traces.each do |trace|
       xml.item do
         xml.title trace.name
 
-        xml.link url_for(:controller => :traces, :action => :view, :id => trace.id, :display_name => trace.user.display_name, :only_path => false)
-        xml.guid url_for(:controller => :traces, :action => :view, :id => trace.id, :display_name => trace.user.display_name, :only_path => false)
+        xml.link url_for(:controller => :traces, :action => :show, :id => trace.id, :display_name => trace.user.display_name, :only_path => false)
+        xml.guid url_for(:controller => :traces, :action => :show, :id => trace.id, :display_name => trace.user.display_name, :only_path => false)
 
         xml.description do
           xml.cdata! render(:partial => "description", :object => trace, :formats => [:html])
@@ -30,7 +30,7 @@ xml.rss("version" => "2.0",
 
         xml.dc :creator, trace.user.display_name
 
-        xml.pubDate trace.timestamp.to_s(:rfc822)
+        xml.pubDate trace.timestamp.to_formatted_s(:rfc822)
 
         if trace.latitude && trace.longitude
           xml.geo :lat, trace.latitude