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

Merge pull request #4534 from tomhughes/list-headers

Browse source 
Add standard List-XXX headers to some notification mails
This commit is contained in:
Andy Allan 2024-02-25 11:36:05 +01:00 • committed by GitHub
commit a1a6c577e8
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
17 changed files with 303 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

20
config/locales/en.yml
View file

@ -464,6 +464,19 @@ en:
feed:
title: "Changeset %{id}"
title_comment: "Changeset %{id} - %{comment}"
subscribe:
heading: Subscribe to the following changeset discussion?
button: Subscribe to discussion
unsubscribe:
heading: Unsubscribe from the following changeset discussion?
button: Unsubscribe from discussion
heading:
title: "Changeset %{id}"
created_by_html: "Created by %{link_user} on %{created}."
no_such_entry:
title: "No such changeset"
heading: "No entry with the id: %{id}"
body: "Sorry, there is no changeset with the id %{id}. Please check your spelling, or maybe the link you clicked is wrong."
timeout:
sorry: "Sorry, the list of changesets you requested took too long to retrieve."
changeset_comments:
@ -1571,6 +1584,7 @@ en:
more: More
user_mailer:
diary_comment_notification:
description: "OpenStreetMap Diary Entry #%{id}"
subject: "[OpenStreetMap] %{user} commented on a diary entry"
hi: "Hi %{to_user},"
header: "%{from_user} has commented on the OpenStreetMap diary entry with the subject %{subject}:"
@ -1627,6 +1641,7 @@ en:
hopefully_you: "Someone (possibly you) has asked for the password to be reset on this email address's openstreetmap.org account."
click_the_link: "If this is you, please click the link below to reset your password."
note_comment_notification:
description: "OpenStreetMap Note #%{id}"
anonymous: An anonymous user
greeting: "Hi,"
commented:
@ -1653,6 +1668,7 @@ en:
details: "More details about the note can be found at %{url}."
details_html: "More details about the note can be found at %{url}."
changeset_comment_notification:
description: "OpenStreetMap Changeset #%{id}"
hi: "Hi %{to_user},"
greeting: "Hi,"
commented:
@ -1667,8 +1683,8 @@ en:
partial_changeset_without_comment: "without comment"
details: "More details about the changeset can be found at %{url}."
details_html: "More details about the changeset can be found at %{url}."
unsubscribe: 'To unsubscribe from updates to this changeset, visit %{url} and click "Unsubscribe".'
unsubscribe_html: 'To unsubscribe from updates to this changeset, visit %{url} and click "Unsubscribe".'
unsubscribe: "You can unsubscribe from updates to this changeset at %{url}."
unsubscribe_html: "You can unsubscribe from updates to this changeset at %{url}."
confirmations:
confirm:
heading: Check your email!

6
config/routes.rb
View file

@ -21,8 +21,8 @@ OpenStreetMap::Application.routes.draw do
post "changeset/:id/upload" => "api/changesets#upload", :as => :changeset_upload, :id => /\d+/
get "changeset/:id/download" => "api/changesets#download", :as => :changeset_download, :id => /\d+/
get "changeset/:id" => "api/changesets#show", :as => :changeset_show, :id => /\d+/
post "changeset/:id/subscribe" => "api/changesets#subscribe", :as => :changeset_subscribe, :id => /\d+/
post "changeset/:id/unsubscribe" => "api/changesets#unsubscribe", :as => :changeset_unsubscribe, :id => /\d+/
post "changeset/:id/subscribe" => "api/changesets#subscribe", :as => :api_changeset_subscribe, :id => /\d+/
post "changeset/:id/unsubscribe" => "api/changesets#unsubscribe", :as => :api_changeset_unsubscribe, :id => /\d+/
put "changeset/:id" => "api/changesets#update", :id => /\d+/
put "changeset/:id/close" => "api/changesets#close", :as => :changeset_close, :id => /\d+/
get "changesets" => "api/changesets#query"
@ -127,6 +127,8 @@ OpenStreetMap::Application.routes.draw do
get "/user/:display_name/notes" => "notes#index", :as => :user_notes
get "/history/friends" => "changesets#index", :friends => true, :as => "friend_changesets", :defaults => { :format => :html }
get "/history/nearby" => "changesets#index", :nearby => true, :as => "nearby_changesets", :defaults => { :format => :html }
match "/changeset/:id/subscribe" => "changesets#subscribe", :via => [:get, :post], :as => "changeset_subscribe"
match "/changeset/:id/unsubscribe" => "changesets#unsubscribe", :via => [:get, :post], :as => "changeset_unsubscribe"
get "/browse/way/:id", :to => redirect(:path => "/way/%{id}")
get "/browse/way/:id/history", :to => redirect(:path => "/way/%{id}/history")