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

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

Browse source
This commit is contained in:
Tom Hughes 2024-02-20 18:29:44 +00:00
commit 1fa2972bcd
2 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/views/changesets/index.atom.builder
View file

@ -25,9 +25,9 @@ atom_feed(:language => I18n.locale, :schema_date => 2009,
:type => "application/osmChange+xml" :type => "application/osmChange+xml"
if !changeset.tags.empty? && changeset.tags.key?("comment") if !changeset.tags.empty? && changeset.tags.key?("comment")
entry.title t("browse.changeset.feed.title_comment", :id => changeset.id, :comment => changeset.tags["comment"]) entry.title t(".feed.title_comment", :id => changeset.id, :comment => changeset.tags["comment"])
else else
entry.title t("browse.changeset.feed.title", :id => changeset.id) entry.title t(".feed.title", :id => changeset.id)
end end
if changeset.user.data_public? if changeset.user.data_public?

6
config/locales/en.yml
View file

@ -346,9 +346,6 @@ en:
comment_by_html: "Comment from %{user} %{time_ago}" comment_by_html: "Comment from %{user} %{time_ago}"
changesetxml: "Changeset XML" changesetxml: "Changeset XML"
osmchangexml: "osmChange XML" osmchangexml: "osmChange XML"
feed:
title: "Changeset %{id}"
title_comment: "Changeset %{id} - %{comment}"
join_discussion: "Log in to join the discussion" join_discussion: "Log in to join the discussion"
discussion: Discussion discussion: Discussion
still_open: "Changeset still open - discussion will open once the changeset is closed." still_open: "Changeset still open - discussion will open once the changeset is closed."
@ -464,6 +461,9 @@ en:
no_more_area: "No more changesets in this area." no_more_area: "No more changesets in this area."
no_more_user: "No more changesets by this user." no_more_user: "No more changesets by this user."
load_more: "Load more" load_more: "Load more"
feed:
title: "Changeset %{id}"
title_comment: "Changeset %{id} - %{comment}"
timeout: timeout:
sorry: "Sorry, the list of changesets you requested took too long to retrieve." sorry: "Sorry, the list of changesets you requested took too long to retrieve."
changeset_comments: changeset_comments: