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

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

Browse source
This commit is contained in:
Tom Hughes 2025-02-15 17:35:49 +00:00
commit b0348093f8
4 changed files with 16 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

10
config/locales/en.yml
View file

@ -1922,7 +1922,7 @@ en:
failure: Couldn't update profile. failure: Couldn't update profile.
sessions: sessions:
new: new:
tab_title: "Log in" tab_title: "Log In"
login_to_authorize_html: "Log in to OpenStreetMap to access %{client_app_name}." login_to_authorize_html: "Log in to OpenStreetMap to access %{client_app_name}."
email or username: "Email Address or Username" email or username: "Email Address or Username"
password: "Password" password: "Password"
@ -2653,8 +2653,8 @@ en:
need_to_see_terms: "Your access to the API is temporarily suspended. Please log-in to the web interface to view the Contributor Terms. You do not need to agree, but you must view them." need_to_see_terms: "Your access to the API is temporarily suspended. Please log-in to the web interface to view the Contributor Terms. You do not need to agree, but you must view them."
settings_menu: settings_menu:
account_settings: Account Settings account_settings: Account Settings
oauth2_applications: OAuth 2 applications oauth2_applications: OAuth 2 Applications
oauth2_authorizations: OAuth 2 authorizations oauth2_authorizations: OAuth 2 Authorizations
muted_users: Muted Users muted_users: Muted Users
auth_providers: auth_providers:
openid_url: "OpenID URL" openid_url: "OpenID URL"
@ -2771,7 +2771,7 @@ en:
users: users:
new: new:
title: "Sign Up" title: "Sign Up"
tab_title: "Sign up" tab_title: "Sign Up"
signup_to_authorize_html: "Sign up with OpenStreetMap to access %{client_app_name}." signup_to_authorize_html: "Sign up with OpenStreetMap to access %{client_app_name}."
no_auto_account_create: "Unfortunately we are not currently able to create an account for you automatically." no_auto_account_create: "Unfortunately we are not currently able to create an account for you automatically."
please_contact_support_html: 'Please contact %{support_link} to arrange for an account to be created - we will try and deal with the request as quickly as possible.' please_contact_support_html: 'Please contact %{support_link} to arrange for an account to be created - we will try and deal with the request as quickly as possible.'
@ -2904,7 +2904,7 @@ en:
index: index:
heading_html: "%{user}'s Comments" heading_html: "%{user}'s Comments"
changesets: "Changesets" changesets: "Changesets"
diary_entries: "Diary entries" diary_entries: "Diary Entries"
no_comments: "No comments" no_comments: "No comments"
changeset_comments: changeset_comments:
index: index:

4
test/application_system_test_case.rb
View file

@ -46,4 +46,8 @@ class ApplicationSystemTestCase < ActionDispatch::SystemTestCase
def within_content_body(&) def within_content_body(&)
within("#content > .content-body", &) within("#content > .content-body", &)
end end
def within_content_heading(&)
within("#content > .content-heading", &)
end
end end

5
test/system/issues_test.rb
View file

@ -5,7 +5,10 @@ class IssuesTest < ApplicationSystemTestCase
def test_view_issues_not_logged_in def test_view_issues_not_logged_in
visit issues_path visit issues_path
assert_content "Log in"
within_content_heading do
assert_content "Log In"
end
end end
def test_view_issues_normal_user def test_view_issues_normal_user

4
test/system/user_signup_test.rb
View file

@ -79,7 +79,9 @@ class UserSignupTest < ApplicationSystemTestCase
test "Sign up from login page" do test "Sign up from login page" do
visit login_path visit login_path
click_on "Sign up" within_content_heading do
click_on "Sign Up"
end
within_content_body do within_content_body do
assert_content "Confirm Password" assert_content "Confirm Password"