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

diff --git a/app/controllers/api/notes_controller.rb b/app/controllers/api/notes_controller.rb
index e6f391ede96e3767e7c5c08f9c210e3a744a9f8c..c489f96be43964640adff2446b154b06e46c6fa2 100644 (file)
--- a/app/controllers/api/notes_controller.rb
+++ b/app/controllers/api/notes_controller.rb
@@ -251,7 +251,9 @@ module Api
       end
 
       # Find the comments we want to return
-      @comments = NoteComment.where(:note => notes).order("created_at DESC").limit(result_limit).preload(:note)
+      @comments = NoteComment.where(:note => notes)
+                             .order(:created_at => :desc).limit(result_limit)
+                             .preload(:author, :note => { :comments => :author })
 
       # Render the result
       respond_to do |format|

diff --git a/app/views/api/notes/feed.rss.builder b/app/views/api/notes/feed.rss.builder
index cf380be31ff8a20729a0ae35ec346052d2cce4ef..4103a20924e9ea6567162af5a8ff28077e1b00e3 100644 (file)
--- a/app/views/api/notes/feed.rss.builder
+++ b/app/views/api/notes/feed.rss.builder
@@ -6,7 +6,11 @@ xml.rss("version" => "2.0",
         "xmlns:georss" => "http://www.georss.org/georss") do
   xml.channel do
     xml.title t("api.notes.rss.title")
-    xml.description t("api.notes.rss.description_area", :min_lat => @min_lat, :min_lon => @min_lon, :max_lat => @max_lat, :max_lon => @max_lon)
+    if @min_lat.nil? && @min_lon.nil? && @max_lat.nil? && @max_lon.nil?
+      xml.description t("api.notes.rss.description_all")
+    else
+      xml.description t("api.notes.rss.description_area", :min_lat => @min_lat, :min_lon => @min_lon, :max_lat => @max_lat, :max_lon => @max_lon)
+    end
     xml.link url_for(:controller => "/site", :action => "index", :only_path => false)
 
     @comments.each do |comment|

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 7b415f6b794b917231796ea916b20b58a1cd0284..2fc8f8196a75a8607b98494e5b8ef1d268cf4e52 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -228,6 +228,7 @@ en:
         reopened_at_by_html: "Reactivated %{when} by %{user}"
       rss:
         title: "OpenStreetMap Notes"
+        description_all: "A list of reported, commented on or closed notes"
         description_area: "A list of notes, reported, commented on or closed in your area [(%{min_lat}|%{min_lon}) -- (%{max_lat}|%{max_lon})]"
         description_item: "An rss feed for note %{id}"
         opened: "new note (near %{place})"