From 751e76678a611240aa5d4110ae556fb6e059ed0f Mon Sep 17 00:00:00 2001
From: Hanna Laakso <hanna.laakso@digital.cabinet-office.gov.uk>
Date: Mon, 11 Sep 2023 16:48:32 +0100
Subject: [PATCH 1/5] Remove legacy code to render travel alerts

Remove code from the view that would have rendered travel alerts as part of govspeak. To our knowledge this code has never been used as it wasn't possible to set alert_status in the editor until recently.

Also remove formatting from the presenter which was customised for rendering the alerts in govspeak by flattening the array of alert statuses and wrapping each in a paragraph tag. This is in readiness for rendering the alerts with warning text in the next commit.
---
 app/presenters/travel_advice_presenter.rb           |  7 ++-----
 app/views/shared/_travel_advice_first_part.html.erb | 10 ----------
 2 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/app/presenters/travel_advice_presenter.rb b/app/presenters/travel_advice_presenter.rb
index f398b0851..982a67102 100644
--- a/app/presenters/travel_advice_presenter.rb
+++ b/app/presenters/travel_advice_presenter.rb
@@ -82,14 +82,11 @@ def alert_status
       avoid_all_travel_to_whole_country
     ]
     alert_statuses = content_item["details"]["alert_status"] || []
-    alert_statuses = alert_statuses.map do |alert|
+    alert_statuses.map do |alert|
       if allowed_statuses.include?(alert)
-        copy = I18n.t("travel_advice.alert_status.#{alert}_html").html_safe
-        view_context.tag.p(copy)
+        I18n.t("travel_advice.alert_status.#{alert}_html").html_safe
       end
     end
-
-    alert_statuses.join("").html_safe
   end
 
   def atom_change_description
diff --git a/app/views/shared/_travel_advice_first_part.html.erb b/app/views/shared/_travel_advice_first_part.html.erb
index e1a8d15d4..3eae095e7 100644
--- a/app/views/shared/_travel_advice_first_part.html.erb
+++ b/app/views/shared/_travel_advice_first_part.html.erb
@@ -1,13 +1,3 @@
-<% if content_item.alert_status.present? %>
-  <%= render 'govuk_publishing_components/components/govspeak', {
-    direction: page_text_direction,
-  } do %>
-    <div class="help-notice">
-      <%= raw(content_item.alert_status) %>
-    </div>
-  <% end %>
-<% end %>
-
 <%= render 'govuk_publishing_components/components/metadata', content_item.metadata %>
 <% if content_item.map %>
   <figure class="map">

From 58599176ee84afea86463c392c00e40ae861e77e Mon Sep 17 00:00:00 2001
From: Hanna Laakso <hanna.laakso@digital.cabinet-office.gov.uk>
Date: Mon, 25 Sep 2023 15:19:02 +0100
Subject: [PATCH 2/5] Render alert statuses with warning text component

---
 app/presenters/travel_advice_presenter.rb      | 2 +-
 app/views/content_items/travel_advice.html.erb | 6 ++++++
 config/locales/en.yml                          | 8 ++++----
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/app/presenters/travel_advice_presenter.rb b/app/presenters/travel_advice_presenter.rb
index 982a67102..d680a5c50 100644
--- a/app/presenters/travel_advice_presenter.rb
+++ b/app/presenters/travel_advice_presenter.rb
@@ -84,7 +84,7 @@ def alert_status
     alert_statuses = content_item["details"]["alert_status"] || []
     alert_statuses.map do |alert|
       if allowed_statuses.include?(alert)
-        I18n.t("travel_advice.alert_status.#{alert}_html").html_safe
+        I18n.t("travel_advice.alert_status.#{alert}_html", country: country_name).html_safe
       end
     end
   end
diff --git a/app/views/content_items/travel_advice.html.erb b/app/views/content_items/travel_advice.html.erb
index e2f211a62..3dcc103c9 100644
--- a/app/views/content_items/travel_advice.html.erb
+++ b/app/views/content_items/travel_advice.html.erb
@@ -16,6 +16,12 @@
   <div class="govuk-grid-column-two-thirds travel-advice__header">
     <%= render 'govuk_publishing_components/components/title', @content_item.title_and_context %>
 
+    <% @content_item.alert_status.each do |text| %>
+      <%= render "govuk_publishing_components/components/warning_text", 
+        text: text 
+      %> 
+    <% end %>
+
     <aside class="part-navigation-container" role="complementary">
       <%= render "govuk_publishing_components/components/contents_list", aria: { label: t("travel_advice.pages") }, contents: @content_item.part_link_elements, underline_links: true, ga4_tracking: true %>
 
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 30adbb2e5..0a93fd78f 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -525,10 +525,10 @@ en:
       short_ordinal: "%e %B %Y"
   travel_advice:
     alert_status:
-      avoid_all_but_essential_travel_to_parts_html: The <abbr title="Foreign, Commonwealth and Development Office">FCDO</abbr> advise against all but essential travel to parts of the country.
-      avoid_all_but_essential_travel_to_whole_country_html: The <abbr title="Foreign, Commonwealth and Development Office">FCDO</abbr> advise against all but essential travel to the whole country.
-      avoid_all_travel_to_parts_html: The <abbr title="Foreign, Commonwealth and Development Office">FCDO</abbr> advise against all travel to parts of the country.
-      avoid_all_travel_to_whole_country_html: The <abbr title="Foreign, Commonwealth and Development Office">FCDO</abbr> advise against all travel to the whole country.
+      avoid_all_but_essential_travel_to_parts_html: The <abbr title="Foreign, Commonwealth and Development Office">FCDO</abbr> advise against all but essential travel to parts of %{country}.
+      avoid_all_but_essential_travel_to_whole_country_html: The <abbr title="Foreign, Commonwealth and Development Office">FCDO</abbr> advise against all but essential travel to %{country}.
+      avoid_all_travel_to_parts_html: The <abbr title="Foreign, Commonwealth and Development Office">FCDO</abbr> advise against all travel to parts of %{country}.
+      avoid_all_travel_to_whole_country_html: The <abbr title="Foreign, Commonwealth and Development Office">FCDO</abbr> advise against all travel to %{country}.
     context: Foreign travel advice
     pages: Travel advice pages
     still_current_at: Still current at

From 87d062fea2d141e72fcd204b3418e14ea072e7c4 Mon Sep 17 00:00:00 2001
From: Hanna Laakso <hanna.laakso@digital.cabinet-office.gov.uk>
Date: Mon, 25 Sep 2023 15:21:41 +0100
Subject: [PATCH 3/5] Wrap alert status in govspeak

The alert status copy uses the abbreviation markup as recommended by the GOV.UK styleguide. Wrap the alerts in govspeak to apply the govspeak styling for acronyms.
---
 app/views/content_items/travel_advice.html.erb | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/app/views/content_items/travel_advice.html.erb b/app/views/content_items/travel_advice.html.erb
index 3dcc103c9..72812eb9b 100644
--- a/app/views/content_items/travel_advice.html.erb
+++ b/app/views/content_items/travel_advice.html.erb
@@ -16,10 +16,13 @@
   <div class="govuk-grid-column-two-thirds travel-advice__header">
     <%= render 'govuk_publishing_components/components/title', @content_item.title_and_context %>
 
-    <% @content_item.alert_status.each do |text| %>
-      <%= render "govuk_publishing_components/components/warning_text", 
-        text: text 
-      %> 
+   <%= render "govuk_publishing_components/components/govspeak", {
+    } do %>
+       <% @content_item.alert_status.each do |text| %>
+        <%= render "govuk_publishing_components/components/warning_text", 
+          text: text 
+        %> 
+      <% end %>
     <% end %>
 
     <aside class="part-navigation-container" role="complementary">

From 155aa28bbd4628e0c17f26ee422cad06a100f50e Mon Sep 17 00:00:00 2001
From: Hanna Laakso <hanna.laakso@digital.cabinet-office.gov.uk>
Date: Mon, 11 Sep 2023 16:53:00 +0100
Subject: [PATCH 4/5] Test travel alert status renders correctly

---
 config/i18n-tasks.yml                           | 1 -
 test/presenters/travel_advice_presenter_test.rb | 7 +++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/config/i18n-tasks.yml b/config/i18n-tasks.yml
index 9a65bec26..403ce335a 100644
--- a/config/i18n-tasks.yml
+++ b/config/i18n-tasks.yml
@@ -5,5 +5,4 @@ data:
 ignore_unused:
   - 'content_item.schema_name.*.{one,other,zero,few,many,two}'
   - 'corporate_information_page.*'
-  - 'travel_advice.alert_status.*'
   - 'publication.documents.other'
diff --git a/test/presenters/travel_advice_presenter_test.rb b/test/presenters/travel_advice_presenter_test.rb
index f6cfbba60..49a33e77c 100644
--- a/test/presenters/travel_advice_presenter_test.rb
+++ b/test/presenters/travel_advice_presenter_test.rb
@@ -213,8 +213,11 @@ def schema_name
     test "presents alert statuses" do
       example = schema_item("full-country")
       example["details"]["alert_status"] = %w[avoid_all_but_essential_travel_to_parts avoid_all_travel_to_parts]
-      assert present_example(example).alert_status.include?("advise against all but essential travel")
-      assert present_example(example).alert_status.include?("advise against all travel to parts")
+
+      presented = present_example(example)
+
+      assert presented.alert_status.first.include?("advises against all but essential travel to parts of #{presented.country_name}")
+      assert presented.alert_status.last.include?("advises against all travel to parts of #{presented.country_name}")
     end
 
     test "metadata uses today for 'Still current at'" do

From 6fef6439db42ce215d634cac58109e75d4d956c4 Mon Sep 17 00:00:00 2001
From: Hanna Laakso <hanna.laakso@digital.cabinet-office.gov.uk>
Date: Wed, 27 Sep 2023 17:29:15 +0100
Subject: [PATCH 5/5] Update copy following content design review

---
 config/locales/en.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 0a93fd78f..465ebc43c 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -525,10 +525,10 @@ en:
       short_ordinal: "%e %B %Y"
   travel_advice:
     alert_status:
-      avoid_all_but_essential_travel_to_parts_html: The <abbr title="Foreign, Commonwealth and Development Office">FCDO</abbr> advise against all but essential travel to parts of %{country}.
-      avoid_all_but_essential_travel_to_whole_country_html: The <abbr title="Foreign, Commonwealth and Development Office">FCDO</abbr> advise against all but essential travel to %{country}.
-      avoid_all_travel_to_parts_html: The <abbr title="Foreign, Commonwealth and Development Office">FCDO</abbr> advise against all travel to parts of %{country}.
-      avoid_all_travel_to_whole_country_html: The <abbr title="Foreign, Commonwealth and Development Office">FCDO</abbr> advise against all travel to %{country}.
+      avoid_all_but_essential_travel_to_parts_html: <abbr title="Foreign, Commonwealth and Development Office">FCDO</abbr> advises against all but essential travel to parts of %{country}.
+      avoid_all_but_essential_travel_to_whole_country_html: <abbr title="Foreign, Commonwealth and Development Office">FCDO</abbr> advises against all but essential travel to %{country}.
+      avoid_all_travel_to_parts_html: <abbr title="Foreign, Commonwealth and Development Office">FCDO</abbr> advises against all travel to parts of %{country}.
+      avoid_all_travel_to_whole_country_html: <abbr title="Foreign, Commonwealth and Development Office">FCDO</abbr> advises against all travel to %{country}.
     context: Foreign travel advice
     pages: Travel advice pages
     still_current_at: Still current at