diff --git a/app/main/views/sub_navigation_dictionaries.py b/app/main/views/sub_navigation_dictionaries.py index 05c9954bb..1d30f6606 100644 --- a/app/main/views/sub_navigation_dictionaries.py +++ b/app/main/views/sub_navigation_dictionaries.py @@ -84,6 +84,10 @@ def using_notify_nav(): "name": "Upload a letter", "link": "main.upload_a_letter", }, + { + "name": "Letter specification", + "link": "main.letter_specification", + }, ] }, { diff --git a/app/templates/views/uploads/choose-file.html b/app/templates/views/uploads/choose-file.html index 173d78f32..a9b863601 100644 --- a/app/templates/views/uploads/choose-file.html +++ b/app/templates/views/uploads/choose-file.html @@ -35,7 +35,7 @@ )}}

-

Your file must meet our letter specification.

+

Your file must meet our letter specification.

{% endblock %} diff --git a/app/utils.py b/app/utils.py index 0d254d27b..494d7c261 100644 --- a/app/utils.py +++ b/app/utils.py @@ -623,14 +623,14 @@ LETTER_VALIDATION_MESSAGES = { 'detail': ( 'You need to change the size or orientation of {invalid_pages}.
' 'Files must meet our ' - '' + '' 'letter specification' '.' ), 'summary': ( 'Validation failed because {invalid_pages} {invalid_pages_are_or_is} not A4 portrait size.
' 'Files must meet our ' - '' + '' 'letter specification' '.' ), @@ -640,14 +640,14 @@ LETTER_VALIDATION_MESSAGES = { 'detail': ( 'You need to edit {invalid_pages}.
' 'Files must meet our ' - '' + '' 'letter specification' '.' ), 'summary': ( 'Validation failed because content is outside the printable area on {invalid_pages}.
' 'Files must meet our ' - '' + '' 'letter specification' '.' ), @@ -689,7 +689,7 @@ LETTER_VALIDATION_MESSAGES = { 'summary': ( 'Validation failed because the address block is empty.
' 'Files must meet our ' - '' + '' 'letter specification' '.' ), @@ -791,13 +791,13 @@ def get_letter_validation_error(validation_message, invalid_pages=None, page_cou invalid_pages=invalid_pages, invalid_pages_are_or_is=invalid_pages_are_or_is, page_count=page_count, - letter_spec_guidance=url_for('.upload_a_letter') + letter_spec_guidance=url_for('.letter_specification') ), 'summary': LETTER_VALIDATION_MESSAGES[validation_message]['summary'].format( invalid_pages=invalid_pages, invalid_pages_are_or_is=invalid_pages_are_or_is, page_count=page_count, - letter_spec=url_for('.letter_spec'), + letter_spec_guidance=url_for('.letter_specification'), ), } diff --git a/tests/app/test_utils.py b/tests/app/test_utils.py index 11cf42645..295710df8 100644 --- a/tests/app/test_utils.py +++ b/tests/app/test_utils.py @@ -586,13 +586,11 @@ def test_get_letter_validation_error_for_known_errors( assert detail.text == expected_content if detail.select_one('a'): - assert detail.select_one('a')['href'] == url_for('.upload_a_letter') - assert detail.select_one('a')['target'] == '_blank' + assert detail.select_one('a')['href'] == url_for('.letter_specification') assert summary.text == expected_summary if summary.select_one('a'): - assert summary.select_one('a')['href'] == url_for('.letter_spec') - assert summary.select_one('a')['target'] == '_blank' + assert summary.select_one('a')['href'] == url_for('.letter_specification') @pytest.mark.parametrize("date_from_db, expected_result", [