Merge remote-tracking branch 'openstreetmap/pull/1349'

diff --git a/app/views/diary_entry/rss.rss.builder b/app/views/diary_entry/rss.rss.builder
index 5e1dee7629b132ba754088d5c3394f4a5ef812aa..d9cc40797eae0653c7a02b1648fd600531460dd6 100644 (file)
--- a/app/views/diary_entry/rss.rss.builder
+++ b/app/views/diary_entry/rss.rss.builder
@@ -9,7 +9,7 @@ xml.rss("version" => "2.0",
     xml.link url_for(:action => "list", :host => SERVER_URL)
     xml.image do
       xml.url image_path("mag_map-rss2.0.png")
-      xml.title "OpenStreetMap"
+      xml.title @title
       xml.width "100"
       xml.height "100"
       xml.link url_for(:action => "list", :host => SERVER_URL)
@@ -21,7 +21,7 @@ xml.rss("version" => "2.0",
         xml.link url_for(:action => "view", :id => entry.id, :display_name => entry.user.display_name, :host => SERVER_URL)
         xml.guid url_for(:action => "view", :id => entry.id, :display_name => entry.user.display_name, :host => SERVER_URL)
         xml.description entry.body.to_html
-        xml.author entry.user.display_name
+        xml.dc :creator, entry.user.display_name
         xml.pubDate entry.created_at.to_s(:rfc822)
         xml.comments url_for(:action => "view", :id => entry.id, :display_name => entry.user.display_name, :anchor => "comments", :host => SERVER_URL)
 

diff --git a/app/views/notes/_note.rss.builder b/app/views/notes/_note.rss.builder
index 900e7fd7cb328bfcb0e6e3b59ef2e8b4cafcc4b8..038ca564b36ba989ffa35e730bf1f279b6801b5a 100644 (file)
--- a/app/views/notes/_note.rss.builder
+++ b/app/views/notes/_note.rss.builder
@@ -13,7 +13,7 @@ xml.item do
   xml.guid note_url(note)
   xml.description render(:partial => "description", :object => note, :formats => [:html])
 
-  xml.author note.author.display_name if note.author
+  xml.dc :creator, note.author.display_name if note.author
 
   xml.pubDate note.updated_at.to_s(:rfc822)
   xml.geo :lat, note.lat

diff --git a/app/views/trace/georss.rss.builder b/app/views/trace/georss.rss.builder
index 176f2bdbf9c9aa43f8197d4fb74d3283bce2478f..6d3aeebe022d9b6d32dccef09abf2a47ebf3c6a2 100644 (file)
--- a/app/views/trace/georss.rss.builder
+++ b/app/views/trace/georss.rss.builder
@@ -10,7 +10,7 @@ xml.rss("version" => "2.0",
     xml.link url_for(:controller => :trace, :action => :list, :only_path => false)
 
     xml.image do
-      xml.url image_path("mag_map-rss2.0.png")
+      xml.url image_path("mag_map-rss2.0.png", :host => SERVER_URL)
       xml.title t("trace.georss.title")
       xml.width 100
       xml.height 100