diff --git a/app/main/views/send.py b/app/main/views/send.py index 968452852..c3415c78b 100644 --- a/app/main/views/send.py +++ b/app/main/views/send.py @@ -596,6 +596,7 @@ def _check_messages(service_id, template_id, upload_id, preview_row, letters_as_ ), letter_too_long=is_letter_too_long(page_count), letter_max_pages=LETTER_MAX_PAGE_COUNT, + page_count=page_count ) @@ -890,6 +891,7 @@ def _check_notification(service_id, template_id, exception=None): help=get_help_argument(), letter_too_long=is_letter_too_long(page_count), letter_max_pages=LETTER_MAX_PAGE_COUNT, + page_count=page_count, **(get_template_error_dict(exception) if exception else {}), ) diff --git a/app/main/views/templates.py b/app/main/views/templates.py index e4c8bf159..7e8fc6019 100644 --- a/app/main/views/templates.py +++ b/app/main/views/templates.py @@ -60,6 +60,8 @@ def view_template(service_id, template_id): '.send_one_off', service_id=service_id, template_id=template_id )) + page_count = get_page_count_for_letter(template) + return render_template( 'views/templates/template.html', template=get_template( @@ -76,8 +78,9 @@ def view_template(service_id, template_id): ), template_postage=template["postage"], user_has_template_permission=user_has_template_permission, - letter_too_long=is_letter_too_long(get_page_count_for_letter(template)), + letter_too_long=is_letter_too_long(page_count), letter_max_pages=LETTER_MAX_PAGE_COUNT, + page_count=page_count ) diff --git a/app/templates/partials/check/letter-too-long.html b/app/templates/partials/check/letter-too-long.html index 58e257f8f..578759bc7 100644 --- a/app/templates/partials/check/letter-too-long.html +++ b/app/templates/partials/check/letter-too-long.html @@ -1,6 +1,8 @@

- This letter is too long + Your letter is too long

- Letters must be {{ letter_max_pages }} pages or fewer + Letters must be {{ letter_max_pages }} pages or less. +
+ Your letter is {{ page_count }} pages long.