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

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

Browse source
This commit is contained in:
Tom Hughes 2024-02-20 18:35:23 +00:00
commit d8cca976c0
12 changed files with 133 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

8
config/locales/en.yml
View file

@ -576,6 +576,12 @@ en:
comment: Comment
newer_comments: "Newer Comments"
older_comments: "Older Comments"
subscribe:
heading: Subscribe to the following diary entry discussion?
button: Subscribe to discussion
unsubscribe:
heading: Unsubscribe from the following diary entry discussion?
button: Unsubscribe from discussion
doorkeeper:
errors:
messages:
@ -1571,6 +1577,8 @@ en:
header_html: "%{from_user} has commented on the OpenStreetMap diary entry with the subject %{subject}:"
footer: "You can also read the comment at %{readurl} and you can comment at %{commenturl} or send a message to the author at %{replyurl}"
footer_html: "You can also read the comment at %{readurl} and you can comment at %{commenturl} or send a message to the author at %{replyurl}"
footer_unsubscribe: "You can unsubscribe from the discussion at %{unsubscribeurl}"
footer_unsubscribe_html: "You can unsubscribe from the discussion at %{unsubscribeurl}"
message_notification:
subject: "[OpenStreetMap] %{message_title}"
hi: "Hi %{to_user},"

4
config/routes.rb
View file

@ -244,8 +244,8 @@ OpenStreetMap::Application.routes.draw do
post "/user/:display_name/diary/:id/unhide" => "diary_entries#unhide", :id => /\d+/, :as => :unhide_diary_entry
post "/user/:display_name/diary/:id/hidecomment/:comment" => "diary_entries#hidecomment", :id => /\d+/, :comment => /\d+/, :as => :hide_diary_comment
post "/user/:display_name/diary/:id/unhidecomment/:comment" => "diary_entries#unhidecomment", :id => /\d+/, :comment => /\d+/, :as => :unhide_diary_comment
post "/user/:display_name/diary/:id/subscribe" => "diary_entries#subscribe", :as => :diary_entry_subscribe, :id => /\d+/
post "/user/:display_name/diary/:id/unsubscribe" => "diary_entries#unsubscribe", :as => :diary_entry_unsubscribe, :id => /\d+/
match "/user/:display_name/diary/:id/subscribe" => "diary_entries#subscribe", :via => [:get, :post], :as => :diary_entry_subscribe, :id => /\d+/
match "/user/:display_name/diary/:id/unsubscribe" => "diary_entries#unsubscribe", :via => [:get, :post], :as => :diary_entry_unsubscribe, :id => /\d+/
# user pages
resources :users, :path => "user", :param => :display_name, :only => [:show, :destroy]