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

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

diff --git a/app/views/notes/index.rss.builder b/app/views/notes/index.rss.builder
index d6ee2bbad8ddf53a808d6b0006a203b529d2e0ff..d28efa1942da01a918fb9f38cea6b508b3f2eae5 100644 (file)
--- a/app/views/notes/index.rss.builder
+++ b/app/views/notes/index.rss.builder
@@ -1,13 +1,14 @@
 xml.instruct!
 
-xml.rss("version" => "2.0", 
+xml.rss("version" => "2.0",
+        "xmlns:dc" => "http://purl.org/dc/elements/1.1/",
         "xmlns:geo" => "http://www.w3.org/2003/01/geo/wgs84_pos#",
         "xmlns:georss" => "http://www.georss.org/georss") do
   xml.channel do
-    xml.title t('note.rss.title')
-    xml.description t('note.rss.description_area', :min_lat => @min_lat, :min_lon => @min_lon, :max_lat => @max_lat, :max_lon => @max_lon )
+    xml.title t("notes.rss.title")
+    xml.description t("notes.rss.description_area", :min_lat => @min_lat, :min_lon => @min_lon, :max_lat => @max_lat, :max_lon => @max_lon)
     xml.link url_for(:controller => "site", :action => "index", :only_path => false)
 
-    xml << render(:partial => "note", :collection => @notes)
+    xml << (render(:partial => "note", :collection => @notes) || "")
   end
 end