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

[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 57befe117b5e39e9f726221f453eae66db277eaf..c8ffe1a81c973a852af251c1147fa4e8d024094d 100644 (file)
--- a/app/views/changesets/index.atom.builder
+++ b/app/views/changesets/index.atom.builder
@@ -1,10 +1,11 @@
 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)
 

-  feed.updated @edits.map { |e| [e.created_at, e.closed_at].max }.max
+  feed.updated @changesets.map { |e| [e.created_at, e.closed_at].max }.max

   feed.icon image_url("favicon.ico")
   feed.logo image_url("mag_map-rss2.0.png")
 
   feed.icon image_url("favicon.ico")
   feed.logo image_url("mag_map-rss2.0.png")
 


@@ -14,19 +15,19 @@ atom_feed(:language => I18n.locale, :schema_date => 2009,
     end
   end
 
     end
   end
 

-  @edits.each do |changeset|
+  @changesets.each do |changeset|

     feed.entry(changeset, :updated => changeset.closed_at, :id => changeset_url(changeset.id, :only_path => false)) do |entry|
       entry.link :rel => "alternate",
     feed.entry(changeset, :updated => changeset.closed_at, :id => changeset_url(changeset.id, :only_path => false)) do |entry|
       entry.link :rel => "alternate",

-                 :href => changeset_read_url(changeset, :only_path => false),
+                 :href => changeset_show_url(changeset, :only_path => false),

                  :type => "application/osm+xml"
       entry.link :rel => "alternate",
                  :href => changeset_download_url(changeset, :only_path => false),
                  :type => "application/osmChange+xml"
 
       if !changeset.tags.empty? && changeset.tags.key?("comment")
                  :type => "application/osm+xml"
       entry.link :rel => "alternate",
                  :href => changeset_download_url(changeset, :only_path => false),
                  :type => "application/osmChange+xml"
 
       if !changeset.tags.empty? && changeset.tags.key?("comment")

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

       else
       else

-        entry.title t("browse.changeset.feed.title", :id => h(changeset.id))
+        entry.title t(".feed.title", :id => changeset.id)

       end
 
       if changeset.user.data_public?
       end
 
       if changeset.user.data_public?


@@ -40,18 +41,18 @@ atom_feed(:language => I18n.locale, :schema_date => 2009,
         xhtml.style "th { text-align: left } tr { vertical-align: top }"
         xhtml.table do |table|
           table.tr do |tr|
         xhtml.style "th { text-align: left } tr { vertical-align: top }"
         xhtml.table do |table|
           table.tr do |tr|

-            tr.th t("browse.created")
+            tr.th t(".feed.created")

             tr.td l(changeset.created_at)
           end
           table.tr do |tr|
             tr.td l(changeset.created_at)
           end
           table.tr do |tr|

-            tr.th t("browse.closed")
+            tr.th t(".feed.closed")

             tr.td l(changeset.closed_at)
           end
           if changeset.user.data_public?
             table.tr do |tr|
             tr.td l(changeset.closed_at)
           end
           if changeset.user.data_public?
             table.tr do |tr|

-              tr.th t("browse.changeset.belongs_to")
+              tr.th t(".feed.belongs_to")

               tr.td do |td|
               tr.td do |td|

-                td.a h(changeset.user.display_name), :href => user_url(changeset.user, :only_path => false)
+                td.a changeset.user.display_name, :href => user_url(changeset.user, :only_path => false)

               end
             end
           end
               end
             end
           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 << "#{h(tag[0])} = #{linkify(h(tag[1]))}"
+                      tag_tr.td "#{tag[0]} = #{linkify(tag[1])}"

                     end
                   end
                 end
                     end
                   end
                 end


@@ -72,14 +73,14 @@ atom_feed(:language => I18n.locale, :schema_date => 2009,
         end
       end
 
         end
       end
 

-      if changeset.has_valid_bbox?
+      if changeset.bbox_valid?

         bbox = changeset.bbox.to_unscaled
 
         # See http://georss.org/Encodings#Geometry
         lower_corner = "#{bbox.min_lat} #{bbox.min_lon}"
         upper_corner = "#{bbox.max_lat} #{bbox.max_lon}"
 
         bbox = changeset.bbox.to_unscaled
 
         # See http://georss.org/Encodings#Geometry
         lower_corner = "#{bbox.min_lat} #{bbox.min_lon}"
         upper_corner = "#{bbox.max_lat} #{bbox.max_lon}"
 

-        feed.georss :box, lower_corner + " " + upper_corner
+        feed.georss :box, "#{lower_corner} #{upper_corner}"

       end
     end
   end
       end
     end
   end