cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Tom Hughes 2023-09-02 11:47:39 +01:00
commit 9693a09664
2 changed files with 6 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/views/api/notes/feed.rss.builder
View file

@ -6,7 +6,11 @@ xml.rss("version" => "2.0",
"xmlns:georss" => "http://www.georss.org/georss") do "xmlns:georss" => "http://www.georss.org/georss") do
xml.channel do xml.channel do
xml.title t("api.notes.rss.title") 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) xml.link url_for(:controller => "/site", :action => "index", :only_path => false)
@comments.each do |comment| @comments.each do |comment|

1
config/locales/en.yml
View file

@ -228,6 +228,7 @@ en:
reopened_at_by_html: "Reactivated %{when} by %{user}" reopened_at_by_html: "Reactivated %{when} by %{user}"
rss: rss:
title: "OpenStreetMap Notes" 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_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}" description_item: "An rss feed for note %{id}"
opened: "new note (near %{place})" opened: "new note (near %{place})"