From d9de2f1dfbae46809e027aaccffee998c6eda4e9 Mon Sep 17 00:00:00 2001 From: TomJKing Date: Mon, 28 Oct 2024 07:49:18 +0000 Subject: [PATCH 1/3] Update message to include email address --- conf/messages | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/messages b/conf/messages index 15bc74f91..c090b166e 100644 --- a/conf/messages +++ b/conf/messages @@ -43,4 +43,4 @@ draftMetadata.validation.action.UTF_8=Ensure that you save your Excel file as fi draftMetadata.validation.details.INVALID_CSV=The metadata file you uploaded was not a CSV. draftMetadata.validation.action.INVALID_CSV=Ensure that you save your Excel file as file type ''CSV UTF-8 (comma separated)''. draftMetadata.validation.details.VIRUS=A virus was found in your metadata file. -draftMetadata.validation.action.VIRUS=Contact your internal IT support service. +draftMetadata.validation.action.VIRUS=Please get in touch on tdr@nationalarchives.gov.uk, so that we can validate this before contacting your own internal support. From a340b77dbd944ee7ae6acace0af3451081558616 Mon Sep 17 00:00:00 2001 From: TomJKing Date: Mon, 28 Oct 2024 08:06:29 +0000 Subject: [PATCH 2/3] Render HTML in message strings --- app/views/partials/draftMetadataChecksActionProcess.scala.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/partials/draftMetadataChecksActionProcess.scala.html b/app/views/partials/draftMetadataChecksActionProcess.scala.html index 9d0684d56..285a3554a 100644 --- a/app/views/partials/draftMetadataChecksActionProcess.scala.html +++ b/app/views/partials/draftMetadataChecksActionProcess.scala.html @@ -31,7 +31,7 @@

Action
- @actionMessage + @Html(actionMessage)
From 53bfb02d738ada16233de65c23dd2225d7a2e826 Mon Sep 17 00:00:00 2001 From: TomJKing Date: Mon, 28 Oct 2024 08:27:24 +0000 Subject: [PATCH 3/3] Fix unit test --- test/controllers/DraftMetadataChecksResultsControllerSpec.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/controllers/DraftMetadataChecksResultsControllerSpec.scala b/test/controllers/DraftMetadataChecksResultsControllerSpec.scala index ed645c5f1..8a4ef1632 100644 --- a/test/controllers/DraftMetadataChecksResultsControllerSpec.scala +++ b/test/controllers/DraftMetadataChecksResultsControllerSpec.scala @@ -180,7 +180,7 @@ class DraftMetadataChecksResultsControllerSpec extends FrontEndTestHelper { CompletedWithIssuesValue.value, FileError.UTF_8, "The metadata file was not a CSV in UTF-8 format.", - s"Ensure that you save your Excel file as file type 'CSV UTF-8 (comma separated)'." + s"Ensure that you save your Excel file as file type 'CSV UTF-8 (comma separated)'." ) ) forAll(draftMetadataStatuses) { (statusValue, fileError, detailsMessage, actionMessage) =>