Merge pull request #1636 from alphagov/dont-list-all-address-columns

Don’t list all letter address cols if some missing

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

@@ -48,7 +48,10 @@
       {% 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 {{ required_recipient_columns | formatted_list(
+          Your file needs {{ (
+            recipients.missing_column_headers
+            if template.template_type == 'letter' else required_recipient_columns
+          ) | formatted_list(
             prefix='a column called',
             prefix_plural='columns called'
           ) }}

tests/app/main/views/test_send.py

@@ -1883,7 +1883,7 @@ def test_check_messages_column_error_doesnt_show_optional_columns(
     )
 
     assert normalize_spaces(page.select_one('.banner-dangerous').text) == (
-        'Your file needs columns called ‘address line 1’, ‘address line 2’ and ‘postcode’ '
+        'Your file needs a column called ‘postcode’ '
         'Right now it has columns called ‘address_line_1’, ‘address_line_2’ and ‘foo’. '
         'Skip to file contents'
     )