From 1c6a71700d1ed85879acd161ffdff7229910ddb9 Mon Sep 17 00:00:00 2001
From: Katie Smith <katie.smith@digital.cabinet-office.gov.uk>
Date: Wed, 9 Jan 2019 13:09:51 +0000
Subject: [PATCH] Update error messages for validation-failed precompiled
 letters

---
 .../views/notifications/invalid_precompiled_letter.html      | 2 +-
 app/templates/views/notifications/notification.html          | 5 ++---
 tests/app/main/views/test_notifications.py                   | 4 ++--
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/app/templates/views/notifications/invalid_precompiled_letter.html b/app/templates/views/notifications/invalid_precompiled_letter.html
index de26ec624..5e924c3e8 100644
--- a/app/templates/views/notifications/invalid_precompiled_letter.html
+++ b/app/templates/views/notifications/invalid_precompiled_letter.html
@@ -12,6 +12,6 @@
       Provided as PDF on {{ created_at|format_datetime_short }}
     </p>
     <p class="notification-status-cancelled">
-      Couldn’t read this file
+      Validation failed – this isn’t a PDF file that Notify can read
     </p>
 {% endblock %}
diff --git a/app/templates/views/notifications/notification.html b/app/templates/views/notifications/notification.html
index 1149ef9db..cab6d4765 100644
--- a/app/templates/views/notifications/notification.html
+++ b/app/templates/views/notifications/notification.html
@@ -16,7 +16,7 @@
 
     <p>
       {% if is_precompiled_letter %}
-      Provided as PDF, sent
+      Provided as PDF
       {% else %}
         {% if help %}
           ‘{{ template.name }}’
@@ -43,8 +43,7 @@
         </p>
       {% elif notification_status == 'validation-failed' %}
         <p class="notification-status-cancelled">
-          Cancelled {{ updated_at|format_datetime_short }}
-          (letter has content outside the printable area)
+          Validation failed – content is outside the printable area
         </p>
       {% else %}
         <p>
diff --git a/tests/app/main/views/test_notifications.py b/tests/app/main/views/test_notifications.py
index c27a601bf..b9f3a93de 100644
--- a/tests/app/main/views/test_notifications.py
+++ b/tests/app/main/views/test_notifications.py
@@ -202,7 +202,7 @@ def test_notification_page_shows_page_for_letter_notification(
     ),
     (
         'validation-failed',
-        'Cancelled 1 January at 1:02am (letter has content outside the printable area)',
+        'Validation failed – content is outside the printable area',
     ),
 ))
 @freeze_time("2016-01-01 01:01")
@@ -426,7 +426,7 @@ def test_notifification_page_shows_error_message_if_precompiled_letter_cannot_be
     )
 
     error_message = page.find('p', class_='notification-status-cancelled').text
-    assert normalize_spaces(error_message) == "Couldn’t read this file"
+    assert normalize_spaces(error_message) == "Validation failed – this isn’t a PDF file that Notify can read"
 
 
 def test_should_404_for_unknown_extension(