diff --git a/app/templates/components/list.html b/app/templates/components/list.html index 66e909669..39cade0be 100644 --- a/app/templates/components/list.html +++ b/app/templates/components/list.html @@ -10,6 +10,6 @@ {{ variables | formatted_list( before_each="", after_each='', - separator=' ' + separator=', ' ) }} {%- endmacro %} diff --git a/requirements-app.txt b/requirements-app.txt index 062630eb2..dc565f60c 100644 --- a/requirements-app.txt +++ b/requirements-app.txt @@ -23,5 +23,5 @@ awscli-cwlogs>=1.4,<1.5 # Putting upgrade on hold due to v1.0.0 using sha512 instead of sha1 by default itsdangerous==0.24 # pyup: <1.0.0 -git+https://github.com/alphagov/notifications-utils.git@36.1.2#egg=notifications-utils==36.1.2 +git+https://github.com/alphagov/notifications-utils.git@36.2.1#egg=notifications-utils==36.2.1 git+https://github.com/alphagov/govuk-frontend-jinja.git@v0.3.0-alpha#egg=govuk-frontend-jinja==0.3.0-alpha diff --git a/requirements.txt b/requirements.txt index 649369007..ae6352185 100644 --- a/requirements.txt +++ b/requirements.txt @@ -25,14 +25,14 @@ awscli-cwlogs>=1.4,<1.5 # Putting upgrade on hold due to v1.0.0 using sha512 instead of sha1 by default itsdangerous==0.24 # pyup: <1.0.0 -git+https://github.com/alphagov/notifications-utils.git@36.1.2#egg=notifications-utils==36.1.2 +git+https://github.com/alphagov/notifications-utils.git@36.2.1#egg=notifications-utils==36.2.1 git+https://github.com/alphagov/govuk-frontend-jinja.git@v0.3.0-alpha#egg=govuk-frontend-jinja==0.3.0-alpha ## The following requirements were added by pip freeze: -awscli==1.16.283 +awscli==1.16.292 bleach==3.1.0 boto3==1.9.221 -botocore==1.13.19 +botocore==1.13.28 certifi==2019.9.11 chardet==3.0.4 Click==7.0 @@ -49,7 +49,7 @@ jdcal==1.4.1 Jinja2==2.10.3 jmespath==0.9.4 lml==0.0.9 -lxml==4.4.1 +lxml==4.4.2 MarkupSafe==1.1.1 mistune==0.8.4 monotonic==1.5 diff --git a/tests/app/main/views/test_templates.py b/tests/app/main/views/test_templates.py index 868008708..d95e91465 100644 --- a/tests/app/main/views/test_templates.py +++ b/tests/app/main/views/test_templates.py @@ -1487,11 +1487,11 @@ def test_should_403_when_create_template_with_process_type_of_priority_for_non_p ), ( "hello ((name))", - "hello ((full name))", + "hello ((first name)) ((middle name)) ((last name))", [ 'You removed ((name))', - 'You added ((full name))', - 'Before you send any messages, make sure your API calls include full name.', + 'You added ((first name)) ((middle name)) and ((last name))', + 'Before you send any messages, make sure your API calls include first name, middle name and last name.', ] ), ])