diff --git a/app/templates/views/check.html b/app/templates/views/check.html index 747e68744..7175e8b64 100644 --- a/app/templates/views/check.html +++ b/app/templates/views/check.html @@ -57,13 +57,13 @@
{% call banner_wrapper(type='dangerous') %}

- Your file needs to have {{ recipients.recipient_column_headers | formatted_list( + Your file needs {{ recipients.recipient_column_headers | formatted_list( prefix='a column called', prefix_plural='columns called' ) }}

- Your file has {{ recipients.column_headers | formatted_list( + Right now it has {{ recipients.column_headers | formatted_list( prefix='one column, called ', prefix_plural='columns called ' ) }}. @@ -81,14 +81,8 @@ your template

- Your file has {{ recipients.column_headers | formatted_list( - prefix='one column, called ', - prefix_plural='columns called ' - ) }}. -

-

- It doesn’t have {{ recipients.missing_column_headers | formatted_list( - conjunction='or', + Your file is missing {{ recipients.missing_column_headers | formatted_list( + conjunction='and', prefix='a column called ', prefix_plural='columns called ' ) }}. diff --git a/tests/app/main/views/test_send.py b/tests/app/main/views/test_send.py index 9de1d52e4..52d63ff57 100644 --- a/tests/app/main/views/test_send.py +++ b/tests/app/main/views/test_send.py @@ -130,8 +130,8 @@ def test_upload_csvfile_with_errors_shows_check_page_with_errors( +447700900986 """, ( - 'Your file needs to have a column called ‘phone number’ ' - 'Your file has columns called ‘telephone’ and ‘name’. ' + 'Your file needs a column called ‘phone number’ ' + 'Right now it has columns called ‘telephone’ and ‘name’. ' 'Skip to file contents' ) ), @@ -142,8 +142,7 @@ def test_upload_csvfile_with_errors_shows_check_page_with_errors( """, ( 'The columns in your file need to match the double brackets in your template ' - 'Your file has one column, called ‘phone number’. ' - 'It doesn’t have a column called ‘name’. ' + 'Your file is missing a column called ‘name’. ' 'Skip to file contents' ) ),