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

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

Browse source
This commit is contained in:
Tom Hughes 2024-10-27 10:06:13 +00:00
commit c8ad2cc456
3 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

12
config/locales/en.yml
View file

@ -1076,7 +1076,7 @@ en:
man_made:
adit: "Adit"
advertising: "Advertising"
antenna: "Antenna"
antenna: "Antenna"
avalanche_protection: "Avalanche Protection"
beacon: "Beacon"
beam: "Beam"
@ -1763,14 +1763,14 @@ en:
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."
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:
title: "Read message"
reply_button: "Reply"
unread_button: "Mark as unread"
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."
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:
@ -2826,14 +2826,14 @@ en:
with your ID in your user settings.
user_role:
filter:
not_a_role: "The string `%{role}' is not a valid role."
not_a_role: "The string '%{role}' is not a valid role."
already_has_role: "The user already has role %{role}."
doesnt_have_role: "The user does not have role %{role}."
not_revoke_admin_current_user: "Cannot revoke administrator role from current user."
grant:
are_you_sure: "Are you sure you want to grant the role `%{role}' to the user `%{name}'?"
are_you_sure: "Are you sure you want to grant the role '%{role}' to the user '%{name}'?"
revoke:
are_you_sure: "Are you sure you want to revoke the role `%{role}' from the user `%{name}'?"
are_you_sure: "Are you sure you want to revoke the role '%{role}' from the user '%{name}'?"
user_blocks:
model:
non_moderator_update: "Must be a moderator to create or update a block."

4
test/controllers/messages_controller_test.rb
View file

@ -245,7 +245,7 @@ class MessagesControllerTest < ActionDispatch::IntegrationTest
# Check that we can't reply to somebody else's message
get message_reply_path(message)
assert_redirected_to login_path(:referer => message_reply_path(message))
assert_equal "You are logged in as `#{other_user.display_name}' 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.", flash[:notice]
assert_equal "You are logged in as '#{other_user.display_name}' 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.", flash[:notice]
# Login as the right user
session_for(recipient_user)
@ -302,7 +302,7 @@ class MessagesControllerTest < ActionDispatch::IntegrationTest
# Check that we can't read the message
get message_path(message)
assert_redirected_to login_path(:referer => message_path(message))
assert_equal "You are logged in as `#{other_user.display_name}' 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.", flash[:notice]
assert_equal "You are logged in as '#{other_user.display_name}' 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.", flash[:notice]
# Login as the message sender
session_for(user)

4
test/controllers/user_roles_controller_test.rb
View file

@ -71,7 +71,7 @@ class UserRolesControllerTest < ActionDispatch::IntegrationTest
post grant_role_path(target_user, "no_such_role")
end
assert_redirected_to user_path(target_user)
assert_equal "The string `no_such_role' is not a valid role.", flash[:error]
assert_equal "The string 'no_such_role' is not a valid role.", flash[:error]
end
##
@ -131,7 +131,7 @@ class UserRolesControllerTest < ActionDispatch::IntegrationTest
post revoke_role_path(target_user, "no_such_role")
end
assert_redirected_to user_path(target_user)
assert_equal "The string `no_such_role' is not a valid role.", flash[:error]
assert_equal "The string 'no_such_role' is not a valid role.", flash[:error]
# Revoking administrator role from current user should fail
post revoke_role_path(administrator_user, "administrator")