Merge branch 'master' into convert-all-links-to-govuk-frontend

This commit is contained in:
Tom Byers
2020-02-24 10:12:58 +00:00
committed by GitHub
34 changed files with 468 additions and 135 deletions

View File

@@ -17,7 +17,11 @@
) }}
<p>
{% if is_precompiled_letter %}
Provided as PDF
{% if created_by %}
Uploaded
{% else %}
Provided as PDF
{% endif %}
{% else %}
{% if help %}
{{ template.name }}
@@ -34,7 +38,7 @@
{% elif created_by %}
by {{ created_by.name }}
{% endif %}
on {{ created_at|format_datetime_short }}
{{ created_at|format_datetime_human }}
</p>
{% if template.template_type == 'letter' %}
@@ -67,7 +71,7 @@
{{ letter_print_day }}
</p>
<p>
Estimated delivery date: {{ estimated_letter_delivery_date|string|format_date_short }}
Estimated delivery date: {{ estimated_letter_delivery_date|format_day_of_week }} {{ estimated_letter_delivery_date|format_date_short }}
</p>
{% endif %}
{% endif %}