Localisation updates from https://translatewiki.net.

[rails.git] / app / views / changeset / list.atom.builder

diff --git a/app/views/changeset/list.atom.builder b/app/views/changeset/list.atom.builder
index d9d53593c2dd8f047c25999e2eb1e7338c5d30d7..3e0cd9ec58c6624bf3c27535f93cc5568351a607 100644 (file)
--- a/app/views/changeset/list.atom.builder
+++ b/app/views/changeset/list.atom.builder
@@ -1,14 +1,8 @@
 atom_feed(:language => I18n.locale, :schema_date => 2009,
           :id => url_for(params.merge({ :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({ :only_path => false, :format => nil })),
+          :root_url => url_for(params.merge({ :action => :list, :format => nil, :only_path => false })),

           "xmlns:georss" => "http://www.georss.org/georss") do |feed|
           "xmlns:georss" => "http://www.georss.org/georss") do |feed|

-  feed.title @title
-
-  feed.subtitle :type => 'xhtml' do |xhtml|
-    xhtml.p do |p|
-      p << @description
-    end
-  end
+  feed.title changeset_list_title(params, @user)

 
   feed.updated @edits.map {|e|  [e.created_at, e.closed_at].max }.max
   feed.icon "http://#{SERVER_URL}/favicon.ico"
 
   feed.updated @edits.map {|e|  [e.created_at, e.closed_at].max }.max
   feed.icon "http://#{SERVER_URL}/favicon.ico"


@@ -46,16 +40,16 @@ 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.changeset_details.created_at")
+            tr.th t("browse.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.changeset_details.closed_at")
+            tr.th t("browse.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_details.belongs_to")
+              tr.th t("browse.changeset.belongs_to")

               tr.td do |td|
                 td.a h(changeset.user.display_name), :href => url_for(:controller => "user", :action => "view", :display_name => changeset.user.display_name, :only_path => false)
               end
               tr.td do |td|
                 td.a h(changeset.user.display_name), :href => url_for(:controller => "user", :action => "view", :display_name => changeset.user.display_name, :only_path => false)
               end


@@ -78,15 +72,12 @@ atom_feed(:language => I18n.locale, :schema_date => 2009,
         end
       end
 
         end
       end
 

-      unless changeset.min_lat.nil?
-        minlon = changeset.min_lon/GeoRecord::SCALE.to_f
-        minlat = changeset.min_lat/GeoRecord::SCALE.to_f
-        maxlon = changeset.max_lon/GeoRecord::SCALE.to_f
-        maxlat = changeset.max_lat/GeoRecord::SCALE.to_f
+      if changeset.has_valid_bbox?
+        bbox = changeset.bbox.to_unscaled

 
         # See http://georss.org/Encodings#Geometry
 
         # See http://georss.org/Encodings#Geometry

-        lower_corner = "#{minlat} #{minlon}"
-        upper_corner = "#{maxlat} #{maxlon}"
+        lower_corner = "#{bbox.min_lat} #{bbox.min_lon}"
+        upper_corner = "#{bbox.max_lat} #{bbox.max_lon}"

 
         feed.georss :box, lower_corner + " " + upper_corner
       end
 
         feed.georss :box, lower_corner + " " + upper_corner
       end