diff --git a/app/templates/views/templates/choose.html b/app/templates/views/templates/choose.html index 31b5611b7..505d6f527 100644 --- a/app/templates/views/templates/choose.html +++ b/app/templates/views/templates/choose.html @@ -31,12 +31,7 @@ {% if current_service.has_permission('broadcast') %} prepare a broadcast {%- else %} - send - {% if 'letter' in current_service.permissions %} - emails, text messages or letters - {%- else -%} - emails or text messages - {%- endif %} + send emails, text messages or letters {%- endif %}.

diff --git a/tests/app/main/views/test_templates.py b/tests/app/main/views/test_templates.py index 9eb4483a1..edf61202a 100644 --- a/tests/app/main/views/test_templates.py +++ b/tests/app/main/views/test_templates.py @@ -29,15 +29,12 @@ from tests.conftest import ( @pytest.mark.parametrize('permissions, expected_message', ( (['email'], ( - 'You need a template before you can send emails or text messages.' - )), - (['sms'], ( - 'You need a template before you can send emails or text messages.' - )), - (['letter'], ( 'You need a template before you can send emails, text messages or letters.' )), - (['sms', 'letter'], ( + (['sms'], ( + 'You need a template before you can send emails, text messages or letters.' + )), + (['letter'], ( 'You need a template before you can send emails, text messages or letters.' )), (['email', 'sms', 'letter'], ( @@ -88,7 +85,7 @@ def test_should_show_add_template_form_if_service_has_folder_permission( 'Templates' ) assert normalize_spaces(page.select_one('main p').text) == ( - 'You need a template before you can send emails or text messages.' + 'You need a template before you can send emails, text messages or letters.' ) assert [ (item['name'], item['value']) for item in page.select('[type=radio]')