diff --git a/app/templates/components/message-count-label.html b/app/templates/components/message-count-label.html index 1fc8d2e58..ceda09752 100644 --- a/app/templates/components/message-count-label.html +++ b/app/templates/components/message-count-label.html @@ -1,7 +1,3 @@ {% macro message_count_label(count, template_type, suffix='sent') -%} {{ count|message_count_noun(template_type) }} {{ suffix }} {%- endmacro %} - -{% macro iteration_count(count) -%} - {{ count|iteration_count }} -{% endmacro %} diff --git a/app/templates/views/dashboard/_jobs.html b/app/templates/views/dashboard/_jobs.html index c142cc85b..0c9e93cfe 100644 --- a/app/templates/views/dashboard/_jobs.html +++ b/app/templates/views/dashboard/_jobs.html @@ -1,6 +1,6 @@ {% from "components/table.html" import list_table, field, right_aligned_field_heading, row_heading %} {% from "components/big-number.html" import big_number -%} -{% from "components/message-count-label.html" import message_count_label, iteration_count -%} +{% from "components/message-count-label.html" import message_count_label %}
{% call(item, row_number) list_table( @@ -36,7 +36,7 @@ {% elif item.upload_type == 'contact_list' %} {% if item.recent_job_count %} - Used {{ iteration_count(item.recent_job_count) }} + Used {{ item.recent_job_count|iteration_count }} in the last {{ current_service.get_days_of_retention(item.template_type) }} days diff --git a/app/templates/views/uploads/contact-list/contact-list.html b/app/templates/views/uploads/contact-list/contact-list.html index c7d1bab98..4964708dd 100644 --- a/app/templates/views/uploads/contact-list/contact-list.html +++ b/app/templates/views/uploads/contact-list/contact-list.html @@ -4,7 +4,7 @@ {% 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, iteration_count %} +{% from "components/message-count-label.html" import message_count_label %} {% from "components/button/macro.njk" import govukButton %} {% block service_page_title %} @@ -24,7 +24,7 @@ {% if jobs %}

- Used {{ iteration_count(jobs|length) }} + Used {{ jobs|length|iteration_count }} in the last {{ current_service.get_days_of_retention(contact_list.template_type) }} days.