Remove some references to webmaster

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index a40f0f4f726524d7e89c6358d5dc12f355afcc0b..32514771cffbe6ad4ffa692b8032df38d8bc4cc2 100644 (file)
--- 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 5e6505cac16788e3f7d0eb2766bc0c320da988c9..ed00a8fcc4343815278ec7b1c77b8521141056d7 100644 (file)
--- a/app/views/users/blocked.html.erb
+++ b/app/views/users/blocked.html.erb
@@ -6,5 +6,5 @@
 
 <div class="message">
   <h1><%= t "users.new.no_auto_account_create" %></h1>
-  <h2><%= t "users.new.contact_webmaster_html", :webmaster => "mailto:#{Settings.support_email}" %></h2>
+  <h2><%= t "users.new.contact_support_html", :support => "mailto:#{Settings.support_email}" %></h2>
 </div>

diff --git a/app/views/users/suspended.html.erb b/app/views/users/suspended.html.erb
index 002c632dd066e1293f0f28c262a9ac57b97e39ed..ff9c7d3545ab8eaa3ab791e3d523841f533fd6b7 100644 (file)
--- a/app/views/users/suspended.html.erb
+++ b/app/views/users/suspended.html.erb
@@ -4,4 +4,4 @@
   <h1><%= t ".heading" %></h1>
 <% 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 6ebeb3746bd11eff8b1ee3290cdc84f225fe3749..0119aeae1e4687941a5d4b87e139c0249f088440 100644 (file)
--- 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.<br />Please use the link in the account confirmation email to activate your account, or <a href=\"%{reconfirm}\">request a new confirmation email</a>."
-      account is suspended: Sorry, your account has been suspended due to suspicious activity.<br />Please contact the <a href="%{webmaster}">webmaster</a> if you wish to discuss this.
+      account is suspended: Sorry, your account has been suspended due to suspicious activity.<br />Please contact <a href="%{webmaster}">support</a> 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 <a href="%{webmaster}">webmaster</a> 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 <a href="%{support}">support</a> 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: |
         <p>
           Sorry, your account has been automatically suspended due to
@@ -2577,7 +2577,7 @@ en:
         </p>
         <p>
           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.
         </p>
     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 589f19a236d27e7b8609bfe0626293d29fb88fa2..21d8847caa59895d7ccbee9b25eeeeaa3eea9710 100644 (file)
--- 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