From 06f2c7eaaab4e943c27c022cbba1e34e98ad7bd4 Mon Sep 17 00:00:00 2001
From: Chris Hill-Scott <me@quis.cc>
Date: Thu, 8 Apr 2021 13:46:40 +0100
Subject: [PATCH] Remove verbs from old alerts
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Now we’ve split the old alerts onto two pages the verbs (‘Broadcast’ and
‘Rejected’) will always be the same for each alert – so they’re not
adding any differentiation.

The specifics of what the datetime means is available on the page for
each alert.

Removing the verbs makes the page a bit less cluttered and makes it
easier to scan down the right hand column.
---
 app/templates/views/broadcast/partials/dashboard-table.html | 4 ++--
 tests/app/main/views/test_broadcast.py                      | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/templates/views/broadcast/partials/dashboard-table.html b/app/templates/views/broadcast/partials/dashboard-table.html
index eb8a6d23f..7a05257e9 100644
--- a/app/templates/views/broadcast/partials/dashboard-table.html
+++ b/app/templates/views/broadcast/partials/dashboard-table.html
@@ -20,7 +20,7 @@
             </p>
           {% elif item.status == 'rejected' %}
             <p class="govuk-body govuk-!-margin-bottom-0 govuk-hint">
-              Rejected {{ item.updated_at|format_datetime_relative }}
+              {{ item.updated_at|format_date_human|title }} at {{ item.updated_at|format_time }}
             </p>
           {% elif item.status == 'broadcasting' %}
             <p class="govuk-body govuk-!-margin-bottom-0 live-broadcast">
@@ -28,7 +28,7 @@
             </p>
           {% else %}
             <p class="govuk-body govuk-!-margin-bottom-0 govuk-hint">
-              Broadcast {{ item.starts_at|format_datetime_relative }}
+              {{ item.starts_at|format_date_human|title }} at {{ item.starts_at|format_time }}
             </p>
           {% endif %}
         </div>
diff --git a/tests/app/main/views/test_broadcast.py b/tests/app/main/views/test_broadcast.py
index 36a687d6f..4b3f4511e 100644
--- a/tests/app/main/views/test_broadcast.py
+++ b/tests/app/main/views/test_broadcast.py
@@ -420,8 +420,8 @@ def test_previous_broadcasts_page(
         normalize_spaces(row.text)
         for row in page.select('.ajax-block-container')[0].select('.file-list')
     ] == [
-        'Example template This is a test Broadcast yesterday at 2:20pm England Scotland',
-        'Example template This is a test Broadcast yesterday at 2:20am England Scotland',
+        'Example template This is a test Yesterday at 2:20pm England Scotland',
+        'Example template This is a test Yesterday at 2:20am England Scotland',
     ]
 
     button = page.select_one(
@@ -455,7 +455,7 @@ def test_rejected_broadcasts_page(
         normalize_spaces(row.text)
         for row in page.select('.ajax-block-container')[0].select('.file-list')
     ] == [
-        'Example template This is a test Rejected today at 1:20am England Scotland',
+        'Example template This is a test Today at 1:20am England Scotland',
     ]
 
     button = page.select_one(