From: Andy Allan Date: Sun, 27 Oct 2024 12:31:51 +0000 (+0000) Subject: Merge pull request #5290 from tomhughes/danger X-Git-Tag: live~42 X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/50cfc0a95cb5cedda0f8043f754a26afafe0a9db?hp=67749e75347ee7ae94ba6f6929846389d8e12118 Merge pull request #5290 from tomhughes/danger Improvements to danger workflow --- diff --git a/config/locales/en.yml b/config/locales/en.yml index 20588e5a8..f68488c09 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -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." @@ -3147,16 +3147,16 @@ en: slight_left_without_exit: Slight left onto %{name} via_point_without_exit: (via point) follow_without_exit: Follow %{name} - roundabout_without_exit: At roundabout take exit onto %{name} - leave_roundabout_without_exit: Leave roundabout - %{name} - stay_roundabout_without_exit: Stay on roundabout - %{name} + roundabout_without_exit: At the roundabout take the exit onto %{name} + leave_roundabout_without_exit: Leave the roundabout - %{name} + stay_roundabout_without_exit: Stay on the roundabout - %{name} start_without_exit: Start on %{name} destination_without_exit: Reach destination against_oneway_without_exit: Go against one-way on %{name} end_oneway_without_exit: End of one-way on %{name} - roundabout_with_exit: At roundabout take exit %{exit} onto %{name} - roundabout_with_exit_ordinal: At roundabout take %{exit} exit onto %{name} - exit_roundabout: Exit roundabout onto %{name} + roundabout_with_exit: At the roundabout take the exit %{exit} onto %{name} + roundabout_with_exit_ordinal: At the roundabout take the %{exit} exit onto %{name} + exit_roundabout: Exit the roundabout onto %{name} unnamed: "unnamed road" courtesy: "Directions courtesy of %{link}" exit_counts: diff --git a/test/controllers/messages_controller_test.rb b/test/controllers/messages_controller_test.rb index 52a856beb..70d1beb18 100644 --- a/test/controllers/messages_controller_test.rb +++ b/test/controllers/messages_controller_test.rb @@ -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) diff --git a/test/controllers/user_roles_controller_test.rb b/test/controllers/user_roles_controller_test.rb index 73b4f0424..66735ccf5 100644 --- a/test/controllers/user_roles_controller_test.rb +++ b/test/controllers/user_roles_controller_test.rb @@ -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")