darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-08-24 16:24:08 -04:00
Code Issues Packages Projects Releases Wiki Activity

Make language consistent

Browse Source 
The `is_default` text and text of the checkbox should use the same
terminology (‘email address’ not ‘address’).
This commit is contained in:
Chris Hill-Scott
2017-09-26 15:34:19 +01:00
parent 8d4418cf61
commit 47ebb6190a
3 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/main/forms.py
View File

@@ -469,7 +469,7 @@ class ProviderForm(Form):
class ServiceReplyToEmailForm(Form): class ServiceReplyToEmailForm(Form):
email_address = email_address(label='Email reply to address') 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): class ServiceSmsSender(Form):

2
app/templates/views/service-settings/email-reply-to/edit.html
View File

@@ -20,7 +20,7 @@
) }} ) }}
{% if form.is_default.data %} {% if form.is_default.data %}
<p class="form-group"> <p class="form-group">
This email address is the default This is the default reply to address for {{ current_service.name }} emails
</p> </p>
{% else %} {% else %}
<div class="form-group"> <div class="form-group">

4
tests/app/main/views/test_service_settings.py
View File

@@ -838,7 +838,9 @@ def test_default_box_shows_on_non_default_email_addresses_while_editing(
if checkbox_present: if checkbox_present:
assert page.select_one('[name=is_default]') assert page.select_one('[name=is_default]')
else: 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( def test_switch_service_to_research_mode(