From a32b751fed507d1d8e0ea502ce527c1c32a84377 Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Tue, 29 Jun 2021 19:22:31 +0100 Subject: [PATCH] Remove some references to webmaster --- .rubocop_todo.yml | 2 -- app/views/users/blocked.html.erb | 2 +- app/views/users/suspended.html.erb | 2 +- config/locales/en.yml | 8 ++++---- test/integration/user_login_test.rb | 12 ++++++------ 5 files changed, 12 insertions(+), 14 deletions(-) diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml index a40f0f4f7..32514771c 100644 --- a/.rubocop_todo.yml +++ b/.rubocop_todo.yml @@ -111,13 +111,11 @@ Naming/InclusiveLanguage: - 'app/helpers/browse_tags_helper.rb' - 'app/views/api/capabilities/show.builder' - 'app/views/confirmations/_resend_success_flash.html.erb' - - 'app/views/users/blocked.html.erb' - 'app/views/users/suspended.html.erb' - 'config/environments/production.rb' - 'config/initializers/canonical_rails.rb' - 'config/initializers/config.rb' - 'config/initializers/doorkeeper.rb' - - 'test/integration/user_login_test.rb' # Offense count: 8 # Configuration parameters: NamePrefix, ForbiddenPrefixes, AllowedMethods, MethodDefinitionMacros. diff --git a/app/views/users/blocked.html.erb b/app/views/users/blocked.html.erb index 5e6505cac..ed00a8fcc 100644 --- a/app/views/users/blocked.html.erb +++ b/app/views/users/blocked.html.erb @@ -6,5 +6,5 @@

<%= t "users.new.no_auto_account_create" %>

-

<%= t "users.new.contact_webmaster_html", :webmaster => "mailto:#{Settings.support_email}" %>

+

<%= t "users.new.contact_support_html", :support => "mailto:#{Settings.support_email}" %>

diff --git a/app/views/users/suspended.html.erb b/app/views/users/suspended.html.erb index 002c632dd..ff9c7d354 100644 --- a/app/views/users/suspended.html.erb +++ b/app/views/users/suspended.html.erb @@ -4,4 +4,4 @@

<%= t ".heading" %>

<% end %> -<%= t ".body_html", :webmaster => link_to(t(".webmaster"), "mailto:#{Settings.support_email}") %> +<%= t ".body_html", :webmaster => link_to(t(".support"), "mailto:#{Settings.support_email}") %> diff --git a/config/locales/en.yml b/config/locales/en.yml index 6ebeb3746..0119aeae1 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -1662,7 +1662,7 @@ en: create account minute: Create an account. It only takes a minute. no account: Don't have an account? account not active: "Sorry, your account is not active yet.
Please use the link in the account confirmation email to activate your account, or request a new confirmation email." - account is suspended: Sorry, your account has been suspended due to suspicious activity.
Please contact the webmaster if you wish to discuss this. + account is suspended: Sorry, your account has been suspended due to suspicious activity.
Please contact support if you wish to discuss this. auth failure: "Sorry, could not log in with those details." openid_logo_alt: "Log in with an OpenID" auth_providers: @@ -2388,7 +2388,7 @@ en: new: title: "Sign Up" no_auto_account_create: "Unfortunately we are not currently able to create an account for you automatically." - contact_webmaster_html: 'Please contact the webmaster to arrange for an account to be created - we will try and deal with the request as quickly as possible.' + contact_support_html: 'Please contact support to arrange for an account to be created - we will try and deal with the request as quickly as possible.' about: header: Free and editable html: | @@ -2569,7 +2569,7 @@ en: suspended: title: Account Suspended heading: Account Suspended - webmaster: webmaster + support: support body_html: |

Sorry, your account has been automatically suspended due to @@ -2577,7 +2577,7 @@ en:

This decision will be reviewed by an administrator shortly, or - you may contact the %{webmaster} if you wish to discuss this. + you may contact %{webmaster} if you wish to discuss this.

auth_failure: connection_failed: Connection to authentication provider failed diff --git a/test/integration/user_login_test.rb b/test/integration/user_login_test.rb index 589f19a23..21d8847ca 100644 --- a/test/integration/user_login_test.rb +++ b/test/integration/user_login_test.rb @@ -114,7 +114,7 @@ class UserLoginTest < ActionDispatch::IntegrationTest assert_template "sessions/new" assert_select "span.username", false assert_select "div.flash.error", /your account has been suspended/ do - assert_select "a[href='mailto:openstreetmap@example.com']", "webmaster" + assert_select "a[href='mailto:openstreetmap@example.com']", "support" end end @@ -126,7 +126,7 @@ class UserLoginTest < ActionDispatch::IntegrationTest assert_template "sessions/new" assert_select "span.username", false assert_select "div.flash.error", /your account has been suspended/ do - assert_select "a[href='mailto:openstreetmap@example.com']", "webmaster" + assert_select "a[href='mailto:openstreetmap@example.com']", "support" end end @@ -138,7 +138,7 @@ class UserLoginTest < ActionDispatch::IntegrationTest assert_template "sessions/new" assert_select "span.username", false assert_select "div.flash.error", /your account has been suspended/ do - assert_select "a[href='mailto:openstreetmap@example.com']", "webmaster" + assert_select "a[href='mailto:openstreetmap@example.com']", "support" end end @@ -271,7 +271,7 @@ class UserLoginTest < ActionDispatch::IntegrationTest assert_template "sessions/new" assert_select "span.username", false assert_select "div.flash.error", /your account has been suspended/ do - assert_select "a[href='mailto:openstreetmap@example.com']", "webmaster" + assert_select "a[href='mailto:openstreetmap@example.com']", "support" end end @@ -283,7 +283,7 @@ class UserLoginTest < ActionDispatch::IntegrationTest assert_template "sessions/new" assert_select "span.username", false assert_select "div.flash.error", /your account has been suspended/ do - assert_select "a[href='mailto:openstreetmap@example.com']", "webmaster" + assert_select "a[href='mailto:openstreetmap@example.com']", "support" end end @@ -295,7 +295,7 @@ class UserLoginTest < ActionDispatch::IntegrationTest assert_template "sessions/new" assert_select "span.username", false assert_select "div.flash.error", /your account has been suspended/ do - assert_select "a[href='mailto:openstreetmap@example.com']", "webmaster" + assert_select "a[href='mailto:openstreetmap@example.com']", "support" end end -- 2.43.2