darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-09-10 10:03:21 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/spreadsheet-error-tweaks'

Browse Source
This commit is contained in:
Chris Hill-Scott
2017-05-16 11:22:19 +01:00
parent 41e952a0f5 d37f7b6bc5
commit 24817de387
2 changed files with 7 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/templates/views/check.html
View File

@@ -57,13 +57,13 @@
<div class="bottom-gutter"> <div class="bottom-gutter">
{% call banner_wrapper(type='dangerous') %} {% call banner_wrapper(type='dangerous') %}
<h1 class='banner-title'> <h1 class='banner-title'>
Your file needs to have {{ recipients.recipient_column_headers | formatted_list( Your file needs {{ recipients.recipient_column_headers | formatted_list(
prefix='a column called', prefix='a column called',
prefix_plural='columns called' prefix_plural='columns called'
) }} ) }}
</h1> </h1>
<p> <p>
Your file has {{ recipients.column_headers | formatted_list( Right now it has {{ recipients.column_headers | formatted_list(
prefix='one column, called ', prefix='one column, called ',
prefix_plural='columns called ' prefix_plural='columns called '
) }}. ) }}.
@@ -81,14 +81,8 @@
your template your template
</h1> </h1>
<p> <p>
Your file has {{ recipients.column_headers | formatted_list( Your file is missing {{ recipients.missing_column_headers | formatted_list(
prefix='one column, called ', conjunction='and',
prefix_plural='columns called '
) }}.
</p>
<p>
It doesn’t have {{ recipients.missing_column_headers | formatted_list(
conjunction='or',
prefix='a column called ', prefix='a column called ',
prefix_plural='columns called ' prefix_plural='columns called '
) }}. ) }}.

7
tests/app/main/views/test_send.py
View File

@@ -130,8 +130,8 @@ def test_upload_csvfile_with_errors_shows_check_page_with_errors(
+447700900986 +447700900986
""", """,
( (
'Your file needs to have a column called ‘phone number’ ' 'Your file needs a column called ‘phone number’ '
'Your file has columns called ‘telephone’ and ‘name’. ' 'Right now it has columns called ‘telephone’ and ‘name’. '
'Skip to file contents' 'Skip to file contents'
) )
), ),
@@ -142,8 +142,7 @@ def test_upload_csvfile_with_errors_shows_check_page_with_errors(
""", """,
( (
'The columns in your file need to match the double brackets in your template ' 'The columns in your file need to match the double brackets in your template '
'Your file has one column, called ‘phone number’. ' 'Your file is missing a column called ‘name’. '
'It doesn’t have a column called ‘name’. '
'Skip to file contents' 'Skip to file contents'
) )
), ),