Merge branch 'master' into openstreetbugs

[rails.git] / app / views / map_bugs / get_bugs.rss.builder

diff --git a/app/views/map_bugs/get_bugs.rss.builder b/app/views/map_bugs/get_bugs.rss.builder
index 49008ce952e7ae90b44ac691f4829235f29f7fee..a8ae98dc8d2bb62f2ebbf7546b310ccf2a40dcdd 100644 (file)
--- a/app/views/map_bugs/get_bugs.rss.builder
+++ b/app/views/map_bugs/get_bugs.rss.builder
@@ -5,21 +5,22 @@ xml.rss("version" => "2.0",
         "xmlns:georss" => "http://www.georss.org/georss") do
   xml.channel do
     xml.title "OpenStreetBugs"
         "xmlns:georss" => "http://www.georss.org/georss") do
   xml.channel do
     xml.title "OpenStreetBugs"

-    xml.description "A list of bugs, reported, commented on or closed in your area"
+    xml.description t('bugs.rss.description_area', :min_lat => @min_lat, :min_lon => @min_lon, :max_lat => @max_lat, :max_lon => @max_lon )

     xml.link url_for(:controller => "site", :action => "index", :only_path => false)
 
        for bug in @bugs
       xml.item do
                if bug.status == "closed"
     xml.link url_for(:controller => "site", :action => "index", :only_path => false)
 
        for bug in @bugs
       xml.item do
                if bug.status == "closed"

-                       xml.title "Closed bug"  
+                       xml.title t('bugs.rss.closed', :place => bug.nearby_place)      

                else if bug.map_bug_comment.length > 1
                else if bug.map_bug_comment.length > 1

-                       xml.title "Commented on bug"
+                       xml.title t('bugs.rss.comment', :place => bug.nearby_place)

                else
                else

-                       xml.title "Created bug"
+                       xml.title t('bugs.rss.new', :place => bug.nearby_place)

                end     end
         
                end     end
         

-        xml.link url_for(:controller => "site", :action => "index", :only_path => false)
-        xml.description  bug.flatten_comment("|")
+        xml.link url_for(:controller => "browse", :action => "bug", :id => bug.id, :only_path => false)
+               xml.guid url_for(:controller => "browse", :action => "bug", :id => bug.id, :only_path => false)
+        xml.description  htmlize(bug.flatten_comment("<br><br>"))

                if (!bug.map_bug_comment.empty?)
                xml.author bug.map_bug_comment[-1].commenter_name
                end
                if (!bug.map_bug_comment.empty?)
                xml.author bug.map_bug_comment[-1].commenter_name
                end