From 24b579418fd82f303fdc05fa6e4f0bbd6fb78e98 Mon Sep 17 00:00:00 2001 From: Chris Hill-Scott Date: Wed, 6 Jan 2021 13:41:16 +0000 Subject: [PATCH] Replace message count macros with formatters We prefer formatters now. Removing uses of the aliasing macro lets remove it entirely. --- app/templates/components/message-count-label.html | 4 +--- app/templates/partials/jobs/count-letters.html | 3 +-- app/templates/views/api/index.html | 3 +-- app/templates/views/check/column-errors.html | 1 - app/templates/views/check/ok.html | 3 +-- app/templates/views/check/row-errors.html | 1 - app/templates/views/dashboard/_inbox.html | 6 ++---- app/templates/views/dashboard/_inbox_messages.html | 1 - app/templates/views/dashboard/_jobs.html | 7 ++----- app/templates/views/dashboard/_totals.html | 7 +++---- .../views/dashboard/all-template-statistics.html | 3 +-- app/templates/views/dashboard/dashboard.html | 1 - app/templates/views/dashboard/monthly.html | 3 +-- app/templates/views/dashboard/template-statistics.html | 3 +-- app/templates/views/notifications.html | 3 +-- app/templates/views/notifications/check.html | 3 +-- app/templates/views/notifications/notification.html | 5 ++--- app/templates/views/organisations/organisation/index.html | 5 ++--- app/templates/views/platform-admin/_global_stats.html | 8 ++++---- app/templates/views/platform-admin/index.html | 3 +-- app/templates/views/platform-admin/services.html | 3 +-- app/templates/views/returned-letter-summary.html | 3 +-- app/templates/views/returned-letters.html | 1 - app/templates/views/templates/_template.html | 3 +-- app/templates/views/templates/_template_list.html | 4 +--- app/templates/views/templates/action_blocked.html | 5 ++--- app/templates/views/templates/choose.html | 1 - .../views/uploads/contact-list/column-errors.html | 1 - .../views/uploads/contact-list/contact-list.html | 4 +--- app/templates/views/uploads/contact-list/ok.html | 1 - app/templates/views/uploads/contact-list/row-errors.html | 2 -- .../views/uploads/contact-list/too-many-columns.html | 2 -- app/templates/views/uploads/uploaded-letters.html | 3 +-- app/templates/views/usage.html | 7 +++---- 34 files changed, 36 insertions(+), 77 deletions(-) diff --git a/app/templates/components/message-count-label.html b/app/templates/components/message-count-label.html index ceda09752..8b1378917 100644 --- a/app/templates/components/message-count-label.html +++ b/app/templates/components/message-count-label.html @@ -1,3 +1 @@ -{% macro message_count_label(count, template_type, suffix='sent') -%} - {{ count|message_count_noun(template_type) }} {{ suffix }} -{%- endmacro %} + diff --git a/app/templates/partials/jobs/count-letters.html b/app/templates/partials/jobs/count-letters.html index 21e242d4e..1e83b8f5a 100644 --- a/app/templates/partials/jobs/count-letters.html +++ b/app/templates/partials/jobs/count-letters.html @@ -1,12 +1,11 @@ {% from 'components/big-number.html' import big_number %} -{% from 'components/message-count-label.html' import message_count_label %}
{{ big_number( job.notification_count, - message_count_label(job.notification_count, 'letter', suffix='')|capitalize, + job.notification_count|message_count_label('letter', suffix='')|capitalize, smaller=True )}}
diff --git a/app/templates/views/api/index.html b/app/templates/views/api/index.html index 803d9e6f1..c513677c4 100644 --- a/app/templates/views/api/index.html +++ b/app/templates/views/api/index.html @@ -1,7 +1,6 @@ {% extends "withnav_template.html" %} {% from "components/table.html" import list_table, field, hidden_field_heading %} {% from "components/banner.html" import banner_wrapper %} -{% from "components/message-count-label.html" import message_count_label %} {% block service_page_title %} API integration @@ -76,7 +75,7 @@ {% endif %} {% endfor %} {% if notification.status not in ('pending-virus-check', 'virus-scan-failed') %} - View {{ message_count_label(1, notification.template.template_type, suffix='') }} + View {{ 1|message_count_label(notification.template.template_type, suffix='') }} {% endif %}
diff --git a/app/templates/views/check/column-errors.html b/app/templates/views/check/column-errors.html index f576ae305..e1d61a0f5 100644 --- a/app/templates/views/check/column-errors.html +++ b/app/templates/views/check/column-errors.html @@ -4,7 +4,6 @@ {% from "components/table.html" import list_table, field, text_field, index_field, hidden_field_heading %} {% from "components/file-upload.html" import file_upload %} {% from "components/back-link/macro.njk" import govukBackLink %} -{% from "components/message-count-label.html" import message_count_label %} {% block service_page_title %} Error diff --git a/app/templates/views/check/ok.html b/app/templates/views/check/ok.html index d61fc0b7a..a72ded28b 100644 --- a/app/templates/views/check/ok.html +++ b/app/templates/views/check/ok.html @@ -3,7 +3,6 @@ {% from "components/radios.html" import radio_select %} {% from "components/table.html" import list_table, field, text_field, index_field, hidden_field_heading %} {% from "components/page-header.html" import page_header %} -{% from "components/message-count-label.html" import message_count_label %} {% from "components/button/macro.njk" import govukButton %} {% from "components/skip-link/macro.njk" import govukSkipLink %} @@ -44,7 +43,7 @@ {% endif %} {% if (template.template_type != 'letter' or not request.args.from_test) and not letter_too_long %} {% set button_text %} - Send {{ count_of_recipients|format_thousands }} {{ message_count_label(count_of_recipients, template.template_type, suffix='') }} + Send {{ count_of_recipients|message_count(template.template_type) }} {% endset %} {{ govukButton({ "text": button_text }) }} {% else %} diff --git a/app/templates/views/check/row-errors.html b/app/templates/views/check/row-errors.html index 49f7dc7cb..83d5a17c4 100644 --- a/app/templates/views/check/row-errors.html +++ b/app/templates/views/check/row-errors.html @@ -4,7 +4,6 @@ {% from "components/table.html" import mapping_table, row, field, text_field, index_field, hidden_field_heading %} {% from "components/file-upload.html" import file_upload %} {% from "components/back-link/macro.njk" import govukBackLink %} -{% from "components/message-count-label.html" import message_count_label %} {% block service_page_title %} Error diff --git a/app/templates/views/dashboard/_inbox.html b/app/templates/views/dashboard/_inbox.html index 10ec4694a..9dd6dc9a8 100644 --- a/app/templates/views/dashboard/_inbox.html +++ b/app/templates/views/dashboard/_inbox.html @@ -1,5 +1,3 @@ -{% from "components/message-count-label.html" import message_count_label %} -
{% if current_service.inbound_sms_summary != None %}
{{ item.name }} - {{ message_count_label(1, item.type, suffix='template')|capitalize }} + {{ 1|message_count_label(item.type, suffix='template')|capitalize }} {% endcall %} {{ spark_bar_field(item.requested_count, most_used_template_count) }} diff --git a/app/templates/views/dashboard/dashboard.html b/app/templates/views/dashboard/dashboard.html index b0afa1d54..3e0ef47f7 100644 --- a/app/templates/views/dashboard/dashboard.html +++ b/app/templates/views/dashboard/dashboard.html @@ -1,7 +1,6 @@ {% extends "withnav_template.html" %} {% from "components/show-more.html" import show_more %} -{% from "components/message-count-label.html" import message_count_label %} {% from "components/table.html" import list_table, field, right_aligned_field_heading, hidden_field_heading %} {% from "components/ajax-block.html" import ajax_block %} diff --git a/app/templates/views/dashboard/monthly.html b/app/templates/views/dashboard/monthly.html index aeb519288..22476e8df 100644 --- a/app/templates/views/dashboard/monthly.html +++ b/app/templates/views/dashboard/monthly.html @@ -2,7 +2,6 @@ {% from "components/big-number.html" import big_number_with_status, big_number %} {% from "components/pill.html" import pill %} {% from "components/table.html" import list_table, field, hidden_field_heading, right_aligned_field_heading, row_heading %} -{% from "components/message-count-label.html" import message_count_label %} {% extends "withnav_template.html" %} @@ -49,7 +48,7 @@ {% call field(align='left') %} {{ big_number( counts.requested, - message_count_label(counts.requested, template_type, suffix=''), + counts.requested|message_count_label(template_type, suffix=''), smallest=True, ) }} {% if counts.requested %} diff --git a/app/templates/views/dashboard/template-statistics.html b/app/templates/views/dashboard/template-statistics.html index 429dc58e4..e58267ecf 100644 --- a/app/templates/views/dashboard/template-statistics.html +++ b/app/templates/views/dashboard/template-statistics.html @@ -1,5 +1,4 @@ {% from "components/big-number.html" import big_number %} -{% from "components/message-count-label.html" import message_count_label %} {% from "components/big-number.html" import big_number %} {% from "components/table.html" import list_table, field, right_aligned_field_heading, row_heading, spark_bar_field %} {% from "components/show-more.html" import show_more %} @@ -30,7 +29,7 @@ {% else %} {{ item.template_name }} - {{ message_count_label(1, item.template_type, suffix='template')|capitalize }} + {{ 1|message_count_label(item.template_type, suffix='template')|capitalize }} {% endif %} {% endcall %} diff --git a/app/templates/views/notifications.html b/app/templates/views/notifications.html index da0182e2d..4d159e63a 100644 --- a/app/templates/views/notifications.html +++ b/app/templates/views/notifications.html @@ -1,6 +1,5 @@ {% extends "withnav_template.html" %} {% from "components/ajax-block.html" import ajax_block %} -{% from "components/message-count-label.html" import message_count_label %} {% from "components/page-header.html" import page_header %} {% from "components/page-footer.html" import page_footer %} {% from "components/form.html" import form_wrapper %} @@ -12,7 +11,7 @@ else '' ) %} {% set page_title = ( - (title_status + message_count_label(99, message_type, suffix='')) | capitalize + (title_status + 99|message_count_label(message_type, suffix='')) | capitalize if current_user.has_permissions('view_activity') else 'Sent messages' ) %} diff --git a/app/templates/views/notifications/check.html b/app/templates/views/notifications/check.html index 92935daeb..118ab5813 100644 --- a/app/templates/views/notifications/check.html +++ b/app/templates/views/notifications/check.html @@ -1,6 +1,5 @@ {% extends "withnav_template.html" %} {% from "components/banner.html" import banner_wrapper %} -{% from "components/message-count-label.html" import message_count_label %} {% from "components/page-header.html" import page_header %} {% from "components/back-link/macro.njk" import govukBackLink %} {% from "components/button/macro.njk" import govukButton %} @@ -77,7 +76,7 @@ )}}" class='page-footer'> {% if not error %} - {% set button_text %}Send 1 {{ message_count_label(1, template.template_type, suffix='') }}{% endset %} + {% set button_text %}Send 1 {{ 1|message_count_label(template.template_type, suffix='') }}{% endset %} {{ govukButton({ "text": button_text }) }} {% endif %} {% if template.template_type == 'letter' %} diff --git a/app/templates/views/notifications/notification.html b/app/templates/views/notifications/notification.html index c0be0e209..808f21a86 100644 --- a/app/templates/views/notifications/notification.html +++ b/app/templates/views/notifications/notification.html @@ -1,18 +1,17 @@ {% extends "withnav_template.html" %} {% from "components/banner.html" import banner %} {% from "components/ajax-block.html" import ajax_block %} -{% from "components/message-count-label.html" import message_count_label %} {% from "components/page-header.html" import page_header %} {% from "components/page-footer.html" import page_footer %} {% block service_page_title %} - {{ message_count_label(1, template.template_type, suffix='') | capitalize }} + {{ 1|message_count_label(template.template_type, suffix='') | capitalize }} {% endblock %} {% block maincolumn_content %} {{ page_header( - message_count_label(1, template.template_type, suffix='') | capitalize, + 1|message_count_label(template.template_type, suffix='') | capitalize, back_link=back_link ) }}

diff --git a/app/templates/views/organisations/organisation/index.html b/app/templates/views/organisations/organisation/index.html index 4caa5ca0b..7d4818872 100644 --- a/app/templates/views/organisations/organisation/index.html +++ b/app/templates/views/organisations/organisation/index.html @@ -1,7 +1,6 @@ {% from "components/page-header.html" import page_header %} {% from "components/big-number.html" import big_number %} {% from "components/live-search.html" import live_search %} -{% from "components/message-count-label.html" import message_count_label %} {% from "components/pill.html" import pill %} {% extends "org_template.html" %} @@ -74,7 +73,7 @@

{{ big_number( service.emails_sent, - label=message_count_label(service.emails_sent, 'email'), + label=service.emails_sent|message_count_label('email'), smallest=True ) }}
@@ -89,7 +88,7 @@ {% else %} {{ big_number( service.sms_billable_units, - 'free {}'.format(message_count_label(service.sms_billable_units, 'sms')), + 'free {}'.format(service.sms_billable_units|message_count_label('sms')), smallest=True ) }} {% endif %} diff --git a/app/templates/views/platform-admin/_global_stats.html b/app/templates/views/platform-admin/_global_stats.html index 1fe7c6c2a..4de9f778c 100644 --- a/app/templates/views/platform-admin/_global_stats.html +++ b/app/templates/views/platform-admin/_global_stats.html @@ -1,10 +1,10 @@ {% from "components/big-number.html" import big_number_with_status %} -{% from "components/message-count-label.html" import message_count_label %} +
{{ big_number_with_status( global_stats.email.delivered + global_stats.email.failed, - message_count_label(global_stats.email.delivered, 'email'), + global_stats.email.delivered|message_count_label('email'), global_stats.email.failed, global_stats.email.failure_rate, global_stats.email.failure_rate|float > 3, @@ -14,7 +14,7 @@
{{ big_number_with_status( global_stats.sms.delivered + global_stats.sms.failed, - message_count_label(global_stats.sms.delivered, 'sms'), + global_stats.sms.delivered|message_count_label('sms'), global_stats.sms.failed, global_stats.sms.failure_rate, global_stats.sms.failure_rate|float > 3, @@ -24,7 +24,7 @@
{{ big_number_with_status( global_stats.letter.requested, - message_count_label(global_stats.letter.requested, 'letter'), + global_stats.letter.requested|message_count_label('letter'), global_stats.letter.failed, global_stats.letter.failure_rate, global_stats.letter.failure_rate|float > 3, diff --git a/app/templates/views/platform-admin/index.html b/app/templates/views/platform-admin/index.html index 8c12297bf..b25e5b1ac 100644 --- a/app/templates/views/platform-admin/index.html +++ b/app/templates/views/platform-admin/index.html @@ -1,6 +1,5 @@ {% extends "views/platform-admin/_base_template.html" %} {% from "components/big-number.html" import big_number_simple %} -{% from "components/message-count-label.html" import message_count_label %} {% from "components/status-box.html" import status_box %} {% from "components/form.html" import form_wrapper %} {% from "components/details/macro.njk" import govukDetails %} @@ -36,7 +35,7 @@
{{ big_number_simple( noti_type.black_box.number, - message_count_label(noti_type.black_box.number, noti_type.black_box.notification_type) + noti_type.black_box.number|message_count_label(noti_type.black_box.notification_type) ) }} {% for item in noti_type.other_data %} diff --git a/app/templates/views/platform-admin/services.html b/app/templates/views/platform-admin/services.html index ee001cb75..0f7a2a975 100644 --- a/app/templates/views/platform-admin/services.html +++ b/app/templates/views/platform-admin/services.html @@ -1,7 +1,6 @@ {% extends "views/platform-admin/_base_template.html" %} {% from "components/page-footer.html" import page_footer %} {% from "components/big-number.html" import big_number, big_number_with_status %} -{% from "components/message-count-label.html" import message_count_label %} {% from "components/table.html" import mapping_table, field, stats_fields, row_group, row, right_aligned_field_heading, hidden_field_heading, text_field %} {% from "components/form.html" import form_wrapper %} {% from "components/button/macro.njk" import govukButton %} @@ -39,7 +38,7 @@ {{ big_number( service['stats'][channel]['requested'], smallest=True, - label=message_count_label(service['stats'][channel]['requested'], channel) + label=service['stats'][channel]['requested']|message_count_label(channel) ) }} {% endcall %} {% endfor %} diff --git a/app/templates/views/returned-letter-summary.html b/app/templates/views/returned-letter-summary.html index b38591297..adaf77963 100644 --- a/app/templates/views/returned-letter-summary.html +++ b/app/templates/views/returned-letter-summary.html @@ -1,5 +1,4 @@ {% from "components/table.html" import list_table, row_heading %} -{% from "components/message-count-label.html" import message_count_label %} {% from "components/page-header.html" import page_header %} {% extends "withnav_template.html" %} @@ -35,7 +34,7 @@ {{ item.reported_at | format_date_normal }}

- {{ item.returned_letter_count}} {{ message_count_label(item.returned_letter_count, 'letter', suffix='')}} + {{ item.returned_letter_count}} {{ item.returned_letter_count|message_count_label('letter', suffix='')}}

{% endcall %} {% endcall %} diff --git a/app/templates/views/returned-letters.html b/app/templates/views/returned-letters.html index f033a33bc..da05c77e9 100644 --- a/app/templates/views/returned-letters.html +++ b/app/templates/views/returned-letters.html @@ -1,5 +1,4 @@ {% from "components/table.html" import list_table, field %} -{% from "components/message-count-label.html" import message_count_label %} {% from "components/page-header.html" import page_header %} {% extends "withnav_template.html" %} diff --git a/app/templates/views/templates/_template.html b/app/templates/views/templates/_template.html index 406f67db7..90a84165d 100644 --- a/app/templates/views/templates/_template.html +++ b/app/templates/views/templates/_template.html @@ -1,4 +1,3 @@ -{% from 'components/message-count-label.html' import message_count_label %} {% from "components/banner.html" import banner_wrapper %}
@@ -9,7 +8,7 @@ {% elif not current_user.has_permissions('send_messages', 'manage_api_keys', 'manage_templates', 'manage_service') or not user_has_template_permission %}

If you need to send this - {{ message_count_label(1, template.template_type, suffix='') }} + {{ 1|message_count_label(template.template_type, suffix='') }} or edit this template, contact your manager.

{% else %} diff --git a/app/templates/views/templates/_template_list.html b/app/templates/views/templates/_template_list.html index 2d4a4f849..c36b3f56c 100644 --- a/app/templates/views/templates/_template_list.html +++ b/app/templates/views/templates/_template_list.html @@ -1,5 +1,3 @@ -{% from "components/message-count-label.html" import folder_contents_count, message_count_label %} - {% macro format_item_name(name, separators=True) -%} {%- if name is string -%} {{- name -}} @@ -19,7 +17,7 @@ {% if template_list.folder_is_empty %} This folder is empty {% else %} - There are no {{ message_count_label(1, template_type, suffix='') }} templates in this folder + There are no {{ 1|message_count_label(template_type, suffix='') }} templates in this folder {% endif %}

{% else %} diff --git a/app/templates/views/templates/action_blocked.html b/app/templates/views/templates/action_blocked.html index a2c78e99d..8df000d09 100644 --- a/app/templates/views/templates/action_blocked.html +++ b/app/templates/views/templates/action_blocked.html @@ -1,7 +1,6 @@ {% extends "withnav_template.html" %} {% from "components/page-header.html" import page_header %} {% from "components/page-footer.html" import page_footer %} -{% from "components/message-count-label.html" import message_count_label %} {% block service_page_title %} {{ notification_type.capitalize() }} are disabled @@ -16,10 +15,10 @@ back_link=back_link, ) }}

- Sending {{ message_count_label(999, notification_type, suffix='') -}} has been disabled for your service. + Sending {{ 999|message_count_label(notification_type, suffix='') }} has been disabled for your service.

- If you need to send {{ message_count_label(999, notification_type, suffix='') }} + If you need to send {{ 999|message_count_label(notification_type, suffix='') }} get in touch with the GOV.UK Notify team.

diff --git a/app/templates/views/templates/choose.html b/app/templates/views/templates/choose.html index 0908c1436..444b53a4d 100644 --- a/app/templates/views/templates/choose.html +++ b/app/templates/views/templates/choose.html @@ -1,6 +1,5 @@ {% from "components/folder-path.html" import folder_path, page_title_folder_path %} {% from "components/pill.html" import pill %} -{% from "components/message-count-label.html" import message_count_label %} {% from "components/live-search.html" import live_search %} {% from "components/form.html" import form_wrapper %} {% from "components/page-header.html" import page_header %} diff --git a/app/templates/views/uploads/contact-list/column-errors.html b/app/templates/views/uploads/contact-list/column-errors.html index be2bdc605..171bc8ee6 100644 --- a/app/templates/views/uploads/contact-list/column-errors.html +++ b/app/templates/views/uploads/contact-list/column-errors.html @@ -4,7 +4,6 @@ {% from "components/table.html" import list_table, field, text_field, index_field, hidden_field_heading %} {% from "components/file-upload.html" import file_upload %} {% from "components/back-link/macro.njk" import govukBackLink %} -{% from "components/message-count-label.html" import message_count_label %} {% block service_page_title %} Error diff --git a/app/templates/views/uploads/contact-list/contact-list.html b/app/templates/views/uploads/contact-list/contact-list.html index 4964708dd..9e2377fa4 100644 --- a/app/templates/views/uploads/contact-list/contact-list.html +++ b/app/templates/views/uploads/contact-list/contact-list.html @@ -4,7 +4,6 @@ {% from "components/radios.html" import radio_select %} {% from "components/table.html" import list_table, field, text_field, index_field, hidden_field_heading, row, row_heading %} {% from "components/page-header.html" import page_header %} -{% from "components/message-count-label.html" import message_count_label %} {% from "components/button/macro.njk" import govukButton %} {% block service_page_title %} @@ -64,8 +63,7 @@ {{ big_number( item.notification_count, smallest=True, - label=message_count_label( - item.notification_count, + label=item.notification_count|message_count_label( item.template_type, suffix='waiting to send' ) diff --git a/app/templates/views/uploads/contact-list/ok.html b/app/templates/views/uploads/contact-list/ok.html index 43d7363a1..54afee9df 100644 --- a/app/templates/views/uploads/contact-list/ok.html +++ b/app/templates/views/uploads/contact-list/ok.html @@ -3,7 +3,6 @@ {% from "components/radios.html" import radio_select %} {% from "components/table.html" import list_table, field, text_field, index_field, hidden_field_heading %} {% from "components/page-header.html" import page_header %} -{% from "components/message-count-label.html" import message_count_label %} {% from "components/button/macro.njk" import govukButton %} {% block service_page_title %} diff --git a/app/templates/views/uploads/contact-list/row-errors.html b/app/templates/views/uploads/contact-list/row-errors.html index ba3fd1d14..25fd995ea 100644 --- a/app/templates/views/uploads/contact-list/row-errors.html +++ b/app/templates/views/uploads/contact-list/row-errors.html @@ -4,8 +4,6 @@ {% from "components/table.html" import list_table, field, text_field, index_field, hidden_field_heading %} {% from "components/file-upload.html" import file_upload %} {% from "components/back-link/macro.njk" import govukBackLink %} -{% from "components/message-count-label.html" import message_count_label %} - {% block service_page_title %} Error diff --git a/app/templates/views/uploads/contact-list/too-many-columns.html b/app/templates/views/uploads/contact-list/too-many-columns.html index abc28d08d..72b254601 100644 --- a/app/templates/views/uploads/contact-list/too-many-columns.html +++ b/app/templates/views/uploads/contact-list/too-many-columns.html @@ -4,8 +4,6 @@ {% from "components/table.html" import list_table, field, text_field, index_field, hidden_field_heading %} {% from "components/file-upload.html" import file_upload %} {% from "components/back-link/macro.njk" import govukBackLink %} -{% from "components/message-count-label.html" import message_count_label %} - {% block service_page_title %} Error diff --git a/app/templates/views/uploads/uploaded-letters.html b/app/templates/views/uploads/uploaded-letters.html index bfe7e2093..60c7131c7 100644 --- a/app/templates/views/uploads/uploaded-letters.html +++ b/app/templates/views/uploads/uploaded-letters.html @@ -1,5 +1,4 @@ {% extends "withnav_template.html" %} -{% from 'components/message-count-label.html' import message_count_label %} {% from "components/page-header.html" import page_header %} {% block service_page_title %} @@ -16,7 +15,7 @@ {% if notifications %}

- {{ total|format_thousands}} {{ message_count_label(total, 'letter', suffix='') }} + {{ total|message_count('letter') }}

diff --git a/app/templates/views/usage.html b/app/templates/views/usage.html index d14de5827..4afc893a0 100644 --- a/app/templates/views/usage.html +++ b/app/templates/views/usage.html @@ -1,5 +1,4 @@ {% from "components/big-number.html" import big_number %} -{% from "components/message-count-label.html" import message_count_label %} {% from "components/table.html" import list_table, field, hidden_field_heading, row_heading, text_field %} {% from "components/page-header.html" import page_header %} {% from "components/pill.html" import pill %} @@ -102,15 +101,15 @@ ) }}

    {% if month.free %} -
  • {{ "{:,}".format(month.free) }} free {{ message_count_label(month.free, 'sms', '') }}
    • +
  • {{ month.free|format_thousands }} free {{ month.free|message_count_label('sms', suffix='') }}
    • {% endif %} {% if month.paid %} -
  • {{ "{:,}".format(month.paid) }} {{ message_count_label(month.paid, 'sms', '') }}at +
  • {{ month.paid|message_count('sms') }} at {{- ' {:.2f}p'.format(sms_rate * 100) }}
    • {% endif %} {% for letter in month.letters%} {% if letter.billing_units %} -
  • {{ "{:,} {}".format(letter.billing_units, letter.postage_description) }} {{ message_count_label(letter.billing_units, 'letter', '') }}at +
  • {{ "{:,} {}".format(letter.billing_units, letter.postage_description) }} {{ letter.billing_units|message_count_label('letter', suffix='') }} at {{ letter.rate | format_number_in_pounds_as_currency }}
    • {% endif %} {% endfor %}