Merge remote-tracking branch 'origin/spreadsheet-error-tweaks'

app/templates/views/check.html

@@ -57,13 +57,13 @@
     <div class="bottom-gutter">
       {% call banner_wrapper(type='dangerous') %}
         <h1 class='banner-title'>
-          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'
           ) }}
         </h1>
         <p>
-          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
         </h1>
         <p>
-          Your file has {{ recipients.column_headers | formatted_list(
-            prefix='one column, called ',
-            prefix_plural='columns called '
-          ) }}.
-        </p>
-        <p>
-          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 '
           ) }}.

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'
         )
     ),