From 4a78e76c7f19d56212444eab02a253b488197edb Mon Sep 17 00:00:00 2001 From: Valentin Deniaud Date: Thu, 29 Sep 2022 17:54:55 +0200 Subject: [PATCH] templates: remove useless spaces in resource description (#69422) --- passerelle/templates/passerelle/manage/service_view.html | 3 ++- tests/test_holidays.py | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/passerelle/templates/passerelle/manage/service_view.html b/passerelle/templates/passerelle/manage/service_view.html index 2f0bf4f8..2cb21099 100644 --- a/passerelle/templates/passerelle/manage/service_view.html +++ b/passerelle/templates/passerelle/manage/service_view.html @@ -47,11 +47,12 @@ {% for field, value in object.get_description_fields %} {% if value or value == False %} -

{{field.verbose_name}}{% trans ":" %} +

{{field.verbose_name}}{% trans ":" %} {% spaceless %} {% if value == True %}{% trans "yes" %} {% elif value == False %}{% trans "no" %} {% else %}{{value}} {% endif %} + {% endspaceless %}

{% endif %} {% endfor %} diff --git a/tests/test_holidays.py b/tests/test_holidays.py index 1aa7056d..d0c51dac 100644 --- a/tests/test_holidays.py +++ b/tests/test_holidays.py @@ -129,5 +129,5 @@ def test_holidays_manager(app, admin_user): resp.form['holidays'] = ['summer_holidays', 'christmas_holidays'] resp = resp.form.submit().follow() - assert 'Holidays:\n Vacances d’Été, Vacances de Noël' in resp.text - assert 'Zone:\n C' in resp.text + assert 'Holidays: Vacances d’Été, Vacances de Noël' in resp.text + assert 'Zone: C' in resp.text