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

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

Browse source
This commit is contained in:
Tom Hughes 2024-12-29 19:11:13 +00:00
commit 782e619de2
21 changed files with 205 additions and 153 deletions
Download patch file Download diff file Expand all files Collapse all files

84
config/locales/en.yml
View file

@ -1741,28 +1741,6 @@ en:
confirmation_sent: We've sent a new confirmation note to %{email} and as soon as you confirm your account you'll be able to get mapping.
whitelist: If you use an antispam system which sends confirmation requests then please make sure you whitelist %{sender} as we are unable to reply to any confirmation requests.
messages:
inbox:
title: "Inbox"
messages: "You have %{new_messages} and %{old_messages}"
new_messages:
one: "%{count} new message"
other: "%{count} new messages"
old_messages:
one: "%{count} old message"
other: "%{count} old messages"
no_messages_yet_html: "You have no messages yet. Why not get in touch with some of the %{people_mapping_nearby_link}?"
people_mapping_nearby: "people mapping nearby"
messages_table:
from: "From"
to: "To"
subject: "Subject"
date: "Date"
actions: "Actions"
message_summary:
unread_button: "Mark as unread"
read_button: "Mark as read"
destroy_button: "Delete"
unmute_button: "Move to Inbox"
new:
title: "Send message"
send_message_to_html: "Send a new message to %{name}"
@ -1774,18 +1752,6 @@ en:
title: "No such message"
heading: "No such message"
body: "Sorry there is no message with that id."
outbox:
title: "Outbox"
messages:
one: "You have %{count} sent message"
other: "You have %{count} sent messages"
no_sent_messages_html: "You have no sent messages yet. Why not get in touch with some of the %{people_mapping_nearby_link}?"
people_mapping_nearby: "people mapping nearby"
muted:
title: "Muted Messages"
messages:
one: "%{count} muted message"
other: "You have %{count} muted messages"
reply:
wrong_user: "You are logged in as '%{user}' but the message you have asked to reply to was not sent to that user. Please log in as the correct user in order to reply."
show:
@ -1795,12 +1761,6 @@ en:
destroy_button: "Delete"
back: "Back"
wrong_user: "You are logged in as '%{user}' but the message you have asked to read was not sent by or to that user. Please log in as the correct user in order to read it."
sent_message_summary:
destroy_button: "Delete"
heading:
my_inbox: "My Inbox"
my_outbox: "My Outbox"
muted_messages: "Muted messages"
mark:
as_read: "Message marked as read"
as_unread: "Message marked as unread"
@ -1809,6 +1769,50 @@ en:
error: "The message could not be moved to the Inbox."
destroy:
destroyed: "Message deleted"
mailboxes:
heading:
my_inbox: "My Inbox"
my_outbox: "My Outbox"
muted_messages: "Muted messages"
messages_table:
from: "From"
to: "To"
subject: "Subject"
date: "Date"
actions: "Actions"
message:
unread_button: "Mark as unread"
read_button: "Mark as read"
destroy_button: "Delete"
unmute_button: "Move to Inbox"
inboxes:
show:
title: "Inbox"
messages: "You have %{new_messages} and %{old_messages}"
new_messages:
one: "%{count} new message"
other: "%{count} new messages"
old_messages:
one: "%{count} old message"
other: "%{count} old messages"
no_messages_yet_html: "You have no messages yet. Why not get in touch with some of the %{people_mapping_nearby_link}?"
people_mapping_nearby: "people mapping nearby"
muted_inboxes:
show:
title: "Muted Messages"
messages:
one: "%{count} muted message"
other: "You have %{count} muted messages"
outboxes:
show:
title: "Outbox"
messages:
one: "You have %{count} sent message"
other: "You have %{count} sent messages"
no_sent_messages_html: "You have no sent messages yet. Why not get in touch with some of the %{people_mapping_nearby_link}?"
people_mapping_nearby: "people mapping nearby"
message:
destroy_button: "Delete"
passwords:
new:
title: "Lost password"

12
config/routes.rb
View file

@ -307,16 +307,16 @@ OpenStreetMap::Application.routes.draw do
get "/export/embed" => "export#embed"
# messages
resources :messages, :only => [:create, :show, :destroy] do
resources :messages, :id => /\d+/, :only => [:create, :show, :destroy] do
post :mark
patch :unmute
match :reply, :via => [:get, :post]
collection do
get :inbox
get :muted
get :outbox
end
end
namespace :messages, :path => "/messages" do
resource :inbox, :only => :show
resource :muted_inbox, :path => "muted", :only => :show
resource :outbox, :only => :show
end
get "/user/:display_name/inbox", :to => redirect(:path => "/messages/inbox")
get "/user/:display_name/outbox", :to => redirect(:path => "/messages/outbox")