From 13650b7d4b5b6aa11970d3df0e7ab0d987c7f714 Mon Sep 17 00:00:00 2001 From: Katie Smith Date: Thu, 9 Apr 2020 11:03:07 +0100 Subject: [PATCH 1/2] Update error messages for letters that are too long To specify the number of sheets as well as pages in case this is not clear. --- app/templates/partials/check/letter-too-long.html | 2 +- app/templates/views/guidance/upload-a-letter.html | 2 +- app/templates/views/uploads/choose-file.html | 2 +- app/utils.py | 4 ++-- tests/app/test_utils.py | 4 ++-- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/app/templates/partials/check/letter-too-long.html b/app/templates/partials/check/letter-too-long.html index 45aef892c..42512c71a 100644 --- a/app/templates/partials/check/letter-too-long.html +++ b/app/templates/partials/check/letter-too-long.html @@ -2,7 +2,7 @@ Your letter is too long

- Letters must be {{ letter_max_pages }} pages or less. + Letters must be {{ letter_max_pages }} pages or less ({{ letter_max_pages // 2 }} double-sided sheets of paper).
Your letter is {{ page_count }} pages long.

diff --git a/app/templates/views/guidance/upload-a-letter.html b/app/templates/views/guidance/upload-a-letter.html index 2965e2961..a451a5fa2 100644 --- a/app/templates/views/guidance/upload-a-letter.html +++ b/app/templates/views/guidance/upload-a-letter.html @@ -29,7 +29,7 @@ diff --git a/app/templates/views/uploads/choose-file.html b/app/templates/views/uploads/choose-file.html index 8511053e8..dad4cc0d7 100644 --- a/app/templates/views/uploads/choose-file.html +++ b/app/templates/views/uploads/choose-file.html @@ -44,7 +44,7 @@ diff --git a/app/utils.py b/app/utils.py index 59f236101..d4e92c6cd 100644 --- a/app/utils.py +++ b/app/utils.py @@ -612,12 +612,12 @@ LETTER_VALIDATION_MESSAGES = { 'letter-too-long': { 'title': 'Your letter is too long', 'detail': ( - 'Letters must be 10 pages or less.
' + 'Letters must be 10 pages or less (5 double-sided sheets of paper).
' 'Your letter is {page_count} pages long.' ), 'summary': ( 'Validation failed because this letter is {page_count} pages long.
' - 'Letters must be 10 pages or less.' + 'Letters must be 10 pages or less (5 double-sided sheets of paper).' ), }, 'no-encoded-string': { diff --git a/tests/app/test_utils.py b/tests/app/test_utils.py index b91e473d6..34874ba35 100644 --- a/tests/app/test_utils.py +++ b/tests/app/test_utils.py @@ -462,12 +462,12 @@ def test_get_letter_validation_error_for_unknown_error(): None, 'Your letter is too long', ( - 'Letters must be 10 pages or less. ' + 'Letters must be 10 pages or less (5 double-sided sheets of paper). ' 'Your letter is 13 pages long.' ), ( 'Validation failed because this letter is 13 pages long.' - 'Letters must be 10 pages or less.' + 'Letters must be 10 pages or less (5 double-sided sheets of paper).' ), ), ( From 0b81b697c29708be7764d1e6663374ef39b54c8f Mon Sep 17 00:00:00 2001 From: Katie Smith Date: Thu, 9 Apr 2020 11:04:20 +0100 Subject: [PATCH 2/2] Delete commented code This content was all moved to other pages. --- app/templates/views/using-notify.html | 81 --------------------------- 1 file changed, 81 deletions(-) diff --git a/app/templates/views/using-notify.html b/app/templates/views/using-notify.html index d053122f4..a47d0c14d 100644 --- a/app/templates/views/using-notify.html +++ b/app/templates/views/using-notify.html @@ -26,87 +26,6 @@
  • letters
    • - -