From 91e9cd37b1b3f686e1c10cd3c7ff178b4efdffe4 Mon Sep 17 00:00:00 2001 From: Chris Hill-Scott Date: Wed, 9 Mar 2016 12:22:12 +0000 Subject: [PATCH] =?UTF-8?q?Make=20text=20of=20=E2=80=98send=E2=80=99=20but?= =?UTF-8?q?ton=20say=20=E2=80=98email=E2=80=99=20or=20=E2=80=98text?= =?UTF-8?q?=E2=80=A6=E2=80=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Previously the send button on the ‘Check and confirm’ page always said ‘Send x messages’, irrespective of whether you were sending emails or text messages. This commit makes it say one of - Send 1 email - Send 29 emails - Send 1 text message - Send 999 text messages --- app/main/views/send.py | 14 ++++++++++++++ app/templates/views/check.html | 2 +- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/app/main/views/send.py b/app/main/views/send.py index f89e614ce..b7578afa5 100644 --- a/app/main/views/send.py +++ b/app/main/views/send.py @@ -43,6 +43,19 @@ manage_templates_page_headings = { } +def get_send_button_text(template_type, number_of_messages): + if 1 == number_of_messages: + return { + 'email': 'Send 1 email', + 'sms': 'Send 1 text message' + }[template_type] + else: + return { + 'email': 'Send {} emails', + 'sms': 'Send {} text messages' + }[template_type].format(number_of_messages) + + def get_page_headings(template_type): # User has manage_service role if current_user.has_permissions(['send_texts', 'send_emails', 'send_letters']): @@ -235,6 +248,7 @@ def check_messages(service_id, upload_id): count_of_recipients=session['upload_data']['notification_count'], count_of_displayed_recipients=len(list(recipients.rows_annotated_and_truncated)), original_file_name=session['upload_data'].get('original_file_name'), + send_button_text=get_send_button_text(template.template_type, session['upload_data']['notification_count']), service_id=service_id, service=service, form=CsvUploadForm() diff --git a/app/templates/views/check.html b/app/templates/views/check.html index e48229b55..13b9e86a3 100644 --- a/app/templates/views/check.html +++ b/app/templates/views/check.html @@ -66,7 +66,7 @@ {% else %}
- + Back
{% endif %}