From: Tom Hughes <tom@compton.nu>
Date: Sat, 2 Sep 2023 10:47:39 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/4214'
X-Git-Tag: live~1116
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/9693a0966479f642bc55f93205fea1483675255c?hp=704781ad0b108e80e4c6eef030c8c1c785e815e4

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

diff --git a/app/views/api/notes/feed.rss.builder b/app/views/api/notes/feed.rss.builder
index cf380be31..4103a2092 100644
--- 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 7b415f6b7..2fc8f8196 100644
--- 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})"