From 47ebb6190a5d3fb905ca58d60829c1144cdd6ab2 Mon Sep 17 00:00:00 2001
From: Chris Hill-Scott <me@quis.cc>
Date: Tue, 26 Sep 2017 15:34:19 +0100
Subject: [PATCH] Make language consistent
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The `is_default` text and text of the checkbox should use the same
terminology (‘email address’ not ‘address’).
---
 app/main/forms.py                                             | 2 +-
 app/templates/views/service-settings/email-reply-to/edit.html | 2 +-
 tests/app/main/views/test_service_settings.py                 | 4 +++-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/app/main/forms.py b/app/main/forms.py
index b16f46a42..5981af266 100644
--- a/app/main/forms.py
+++ b/app/main/forms.py
@@ -469,7 +469,7 @@ class ProviderForm(Form):
 
 class ServiceReplyToEmailForm(Form):
     email_address = email_address(label='Email reply to address')
-    is_default = BooleanField("Make this address the default")
+    is_default = BooleanField("Make this email address the default")
 
 
 class ServiceSmsSender(Form):
diff --git a/app/templates/views/service-settings/email-reply-to/edit.html b/app/templates/views/service-settings/email-reply-to/edit.html
index a15902847..fb0fd6473 100644
--- a/app/templates/views/service-settings/email-reply-to/edit.html
+++ b/app/templates/views/service-settings/email-reply-to/edit.html
@@ -20,7 +20,7 @@
     ) }}
     {% if form.is_default.data %}
       <p class="form-group">
-        This email address is the default
+        This is the default reply to address for {{ current_service.name }} emails
       </p>
     {% else %}
       <div class="form-group">
diff --git a/tests/app/main/views/test_service_settings.py b/tests/app/main/views/test_service_settings.py
index 7e97eced7..906ee0bf2 100644
--- a/tests/app/main/views/test_service_settings.py
+++ b/tests/app/main/views/test_service_settings.py
@@ -838,7 +838,9 @@ def test_default_box_shows_on_non_default_email_addresses_while_editing(
     if checkbox_present:
         assert page.select_one('[name=is_default]')
     else:
-        assert normalize_spaces(page.select_one('form p').text) == "This email address is the default"
+        assert normalize_spaces(page.select_one('form p').text) == (
+            'This is the default reply to address for service one emails'
+        )
 
 
 def test_switch_service_to_research_mode(