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

[rails.git] / app / views / changesets / index.atom.builder

diff --git a/app/views/changesets/index.atom.builder b/app/views/changesets/index.atom.builder
index 3ab438b59f7dd14cd0839dfe11969639251bdf50..b37fee36755848a613da8f2295ae2134a039e530 100644 (file)
--- a/app/views/changesets/index.atom.builder
+++ b/app/views/changesets/index.atom.builder
@@ -1,6 +1,7 @@
 atom_feed(:language => I18n.locale, :schema_date => 2009,
           :id => url_for(@params.merge(:only_path => false)),
           :root_url => url_for(@params.merge(:action => :index, :format => nil, :only_path => false)),
 atom_feed(:language => I18n.locale, :schema_date => 2009,
           :id => url_for(@params.merge(:only_path => false)),
           :root_url => url_for(@params.merge(:action => :index, :format => nil, :only_path => false)),

+          "xmlns:xhtml" => "http://www.w3.org/1999/xhtml",

           "xmlns:georss" => "http://www.georss.org/georss") do |feed|
   feed.title changeset_index_title(params, current_user)
 
           "xmlns:georss" => "http://www.georss.org/georss") do |feed|
   feed.title changeset_index_title(params, current_user)
 


@@ -24,7 +25,7 @@ atom_feed(:language => I18n.locale, :schema_date => 2009,
                  :type => "application/osmChange+xml"
 
       if !changeset.tags.empty? && changeset.tags.key?("comment")
                  :type => "application/osmChange+xml"
 
       if !changeset.tags.empty? && changeset.tags.key?("comment")

-        entry.title t("browse.changeset.feed.title_comment", :id => changeset.id, :comment => changeset.tags["comment"]), :type => "html"
+        entry.title t("browse.changeset.feed.title_comment", :id => changeset.id, :comment => changeset.tags["comment"])

       else
         entry.title t("browse.changeset.feed.title", :id => changeset.id)
       end
       else
         entry.title t("browse.changeset.feed.title", :id => changeset.id)
       end


@@ -62,7 +63,7 @@ atom_feed(:language => I18n.locale, :schema_date => 2009,
                 td.table :cellpadding => "0" do |tag_table|
                   changeset.tags.sort.each do |tag|
                     tag_table.tr do |tag_tr|
                 td.table :cellpadding => "0" do |tag_table|
                   changeset.tags.sort.each do |tag|
                     tag_table.tr do |tag_tr|

-                      tag_tr.td << "#{tag[0]} = #{linkify(tag[1])}"
+                      tag_tr.td "#{tag[0]} = #{linkify(tag[1])}"

                     end
                   end
                 end
                     end
                   end
                 end