From f836f206e6150eee7478be29065d48dfcfffefa7 Mon Sep 17 00:00:00 2001 From: Chris Hill-Scott Date: Thu, 11 May 2017 11:22:43 +0100 Subject: [PATCH] =?UTF-8?q?Say=20=E2=80=98missing=E2=80=99=20rather=20than?= =?UTF-8?q?=20=E2=80=98doesn=E2=80=99t=20have=E2=80=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Missing gives more of a suggestion that this is something to be fixed, rather than just a statement of fact. --- app/templates/views/check.html | 4 ++-- tests/app/main/views/test_send.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/templates/views/check.html b/app/templates/views/check.html index ec19a4dc1..a48eb7506 100644 --- a/app/templates/views/check.html +++ b/app/templates/views/check.html @@ -81,8 +81,8 @@ your template

- Your file 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 ddcd61a48..ae064d215 100644 --- a/tests/app/main/views/test_send.py +++ b/tests/app/main/views/test_send.py @@ -142,7 +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 doesn’t have a column called ‘name’. ' + 'Your file is missing a column called ‘name’. ' 'Skip to file contents' ) ),