Update spreadsheet validation errors

app/templates/views/check/column-errors.html

@@ -38,7 +38,7 @@
       {% elif not count_of_recipients %}
 
         <h1 class='banner-title' data-module="track-error" data-error-type="No rows" data-error-label="{{ upload_id }}">
-          Your file is missing some rows
+          Your file is missing rows
         </h1>
         {% if recipients.missing_column_headers %}
           <p>
@@ -56,32 +56,38 @@
       {% elif not recipients.has_recipient_columns %}
 
         <h1 class='banner-title' data-module="track-error" data-error-type="Missing recipient columns" data-error-label="{{ upload_id }}">
-          Your file needs {{ (
+          Your file is missing columns
-            recipients.missing_column_headers
-            if template.template_type == 'letter' else required_recipient_columns
-          ) | formatted_list(
-            prefix='a column called',
-            prefix_plural='columns called'
-          ) }}
         </h1>
-        <p>
+          <p>
-          Right now it has {{ recipients.column_headers | formatted_list(
+            It needs {{ (
-            prefix='one column, called ',
+              recipients.missing_column_headers
-            prefix_plural='columns called '
+              if template.template_type == 'letter' else required_recipient_columns
-          ) }}.
+            ) | formatted_list(
-        </p>
+              prefix='a column called',
+              prefix_plural='columns called'
+            ) }}.
+          </p>
+          <p>
+            Right now it has {{ recipients.column_headers | formatted_list(
+              prefix='one column, called ',
+              prefix_plural='columns called '
+            ) }}.
+          </p>
 
       {% elif recipients.duplicate_recipient_column_headers %}
 
         <h1 class='banner-title' data-module="track-error" data-error-type="Duplicate recipient columns" data-error-label="{{ upload_id }}">
-          Your file has more than one column called {{ (
+          Your file has duplicate columns
-            recipients.duplicate_recipient_column_headers
-          ) | formatted_list(
-            conjunction='or',
-            prefix='',
-            prefix_plural=''
-          ) }}
         </h1>
+           <p>
+            We found more than one column called {{ (
+            recipients.duplicate_recipient_column_headers
+            ) | formatted_list(
+              conjunction='or',
+              prefix='',
+              prefix_plural=''
+            ) }}.
+          </p>
         <p>
           Delete or rename one of these columns and try again.
         </p>
@@ -89,16 +95,18 @@
       {% elif recipients.missing_column_headers %}
 
         <h1 class='banner-title' data-module="track-error" data-error-type="Missing placeholder columns" data-error-label="{{ upload_id }}">
-          The columns in your file need to match the double brackets in
+          Your file is missing columns
-          your template
         </h1>
-        <p>
+          <p>
-          Your file is missing {{ recipients.missing_column_headers | formatted_list(
+            The column names need to match the double brackets in your template.
-            conjunction='and',
+          </p>
-            prefix='a column called ',
+          <p>
-            prefix_plural='columns called '
+            Your file is missing {{ recipients.missing_column_headers | formatted_list(
-          ) }}.
+              conjunction='and',
-        </p>
+              prefix='a column called ',
+              prefix_plural='columns called '
+            ) }}.
+          </p>
 
       {% elif sent_previously %}
 
@@ -141,7 +149,7 @@
         {{ file_upload(
           form.file,
           action=url_for('.send_messages', service_id=current_service.id, template_id=template.id),
-          button_text='Re-upload your file'
+          button_text='Upload a new file'
         ) }}
       {% endif %}
     </div>