From: Tom Hughes <tom@compton.nu>
Date: Sat, 29 Oct 2016 17:08:31 +0000 (+0100)
Subject: Merge remote-tracking branch 'openstreetmap/pull/1349'
X-Git-Tag: live~5120
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/48eb8eb3690851f7f26afc68e1524341fcb6c187?hp=d478f94239ece371d6b14ce5e51adfbf7393073f

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 5e1dee762..d9cc40797 100644
--- 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 900e7fd7c..038ca564b 100644
--- 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 176f2bdbf..6d3aeebe0 100644
--- 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