Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Replace raw url on thank-you page #1343

Merged
merged 5 commits into from
Apr 3, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
74 changes: 36 additions & 38 deletions app/translations/messages.pot
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PROJECT VERSION\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
"POT-Creation-Date: 2024-02-23 11:00+0000\n"
"POT-Creation-Date: 2024-04-02 10:47+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <[email protected]>\n"
Expand Down Expand Up @@ -41,7 +41,7 @@ msgstr ""
msgid "%(from_date)s to %(to_date)s"
msgstr ""

#: app/jinja_filters.py:734
#: app/jinja_filters.py:732
#: templates/partials/summary/collapsible-summary.html:27
#: templates/partials/summary/summary.html:25
msgid "No answer provided"
Expand Down Expand Up @@ -249,55 +249,55 @@ msgid_plural "{number_of_days} days"
msgstr[0] ""
msgstr[1] ""

#: app/routes/errors.py:160
#: app/routes/errors.py:159
msgid "You have reached the maximum number of individual access codes"
msgstr ""

#: app/routes/errors.py:163
#: app/routes/errors.py:162
msgid ""
"If you need more individual access codes, please <a "
"href='{contact_us_url}'>contact us</a>."
msgstr ""

#: app/routes/errors.py:181
#: app/routes/errors.py:180
msgid "You have reached the maximum number of times for submitting feedback"
msgstr ""

#: app/routes/errors.py:184
#: app/routes/errors.py:183
msgid ""
"If you need to give more feedback, please <a "
"href='{contact_us_url}'>contact us</a>."
msgstr ""

#: app/routes/errors.py:232
#: app/routes/errors.py:233
msgid "Sorry, there was a problem sending the access code"
msgstr ""

#: app/routes/errors.py:239
#: app/routes/errors.py:240
msgid "You can try to <a href='{retry_url}'>request a new access code again</a>."
msgstr ""

#: app/routes/errors.py:242 app/routes/errors.py:267 app/routes/errors.py:289
#: app/routes/errors.py:243 app/routes/errors.py:268 app/routes/errors.py:290
msgid ""
"If this problem keeps happening, please <a "
"href='{contact_us_url}'>contact us</a> for help."
msgstr ""

#: app/routes/errors.py:263
#: app/routes/errors.py:264
msgid "Sorry, there was a problem sending the confirmation email"
msgstr ""

#: app/routes/errors.py:264
#: app/routes/errors.py:265
msgid "You can try to <a href='{retry_url}'>send the email again</a>."
msgstr ""

#: app/routes/errors.py:285 templates/errors/403.html:3
#: app/routes/errors.py:286 templates/errors/403.html:3
#: templates/errors/403.html:6 templates/errors/submission-failed.html:5
#: templates/errors/submission-failed.html:8
msgid "Sorry, there is a problem"
msgstr ""

#: app/routes/errors.py:286
#: app/routes/errors.py:287
msgid "You can try to <a href='{retry_url}'>submit your feedback again</a>."
msgstr ""

Expand Down Expand Up @@ -419,7 +419,7 @@ msgstr ""
#: templates/individual_response/confirmation-text-message.html:29
#: templates/individual_response/question.html:5 templates/interstitial.html:8
#: templates/listcollectorcontent.html:6 templates/sectionsummary.html:10
#: templates/sectionsummary.html:48
#: templates/sectionsummary.html:49
msgid "Continue"
msgstr ""

Expand Down Expand Up @@ -831,19 +831,19 @@ msgstr ""
msgid "Print questions"
msgstr ""

#: templates/preview.html:60
#: templates/preview.html:61
msgid "Save questions as PDF"
msgstr ""

#: templates/partials/introduction/preview.html:36
#: templates/partials/introduction/preview.html:37
#: templates/partials/summary/collapsible-summary.html:50
#: templates/preview.html:92
#: templates/preview.html:94
msgid "Show all"
msgstr ""

#: templates/partials/introduction/preview.html:37
#: templates/partials/introduction/preview.html:38
#: templates/partials/summary/collapsible-summary.html:51
#: templates/preview.html:93
#: templates/preview.html:95
msgid "Hide all"
msgstr ""

Expand Down Expand Up @@ -878,60 +878,58 @@ msgid "Thank you for completing the {survey_title}"
msgstr ""

#: templates/thank-you.html:45
msgid "Your answers will be processed in the next few weeks."
msgid ""
"Your response will help inform decision-makers how best to support the UK"
" population and economy."
msgstr ""

#: templates/thank-you.html:46
msgid "We may contact you to query your answers via phone or secure message."
msgid "Learn more about how we use this data"
msgstr ""

#: templates/thank-you.html:47
msgid "For more information on how we use this data."
msgstr ""

#: templates/thank-you.html:51 templates/view-submitted-response.html:69
#: templates/thank-you.html:49 templates/view-submitted-response.html:71
msgid "For security, you can no longer view or get a copy of your answers"
msgstr ""

#: templates/thank-you.html:63
#: templates/thank-you.html:61
msgid "For security, your answers will only be available to view for another "
msgstr ""

#: templates/thank-you.html:64
#: templates/thank-you.html:62
msgid "Get a copy of your answers"
msgstr ""

#: templates/thank-you.html:66
#: templates/thank-you.html:64
msgid ""
"You can <a href='{url}' id='view-submitted-response-link'>save or print "
"your answers</a> for your records."
msgstr ""

#: templates/layouts/_base.html:147 templates/thank-you.html:71
#: templates/layouts/_base.html:147 templates/thank-you.html:69
msgid "minute"
msgstr ""

#: templates/layouts/_base.html:148 templates/thank-you.html:72
#: templates/layouts/_base.html:148 templates/thank-you.html:70
msgid "minutes"
msgstr ""

#: templates/layouts/_base.html:149 templates/thank-you.html:73
#: templates/layouts/_base.html:149 templates/thank-you.html:71
msgid "second"
msgstr ""

#: templates/layouts/_base.html:150 templates/thank-you.html:74
#: templates/layouts/_base.html:150 templates/thank-you.html:72
msgid "seconds"
msgstr ""

#: templates/thank-you.html:76
#: templates/thank-you.html:74
msgid "For security, your answers will only be available to view for 45 minutes"
msgstr ""

#: templates/thank-you.html:85
#: templates/thank-you.html:83
msgid "Get confirmation email"
msgstr ""

#: templates/thank-you.html:86
#: templates/thank-you.html:84
msgid ""
"If you would like to be sent confirmation that you have completed your "
"survey, enter your email address"
Expand All @@ -941,7 +939,7 @@ msgstr ""
msgid "Print answers"
msgstr ""

#: templates/view-submitted-response.html:47
#: templates/view-submitted-response.html:48
msgid "Save answers as PDF"
msgstr ""

Expand Down Expand Up @@ -1254,7 +1252,7 @@ msgstr ""
msgid "Yes, I confirm this is correct"
msgstr ""

#: templates/layouts/_questionnaire.html:39
#: templates/layouts/_questionnaire.html:40
msgid "Choose another section and return to this later"
msgstr ""

Expand Down
6 changes: 2 additions & 4 deletions templates/thank-you.html
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,8 @@ <h1 data-qa="title">{{ _("Thank you for completing the {survey_title}").format(
{% set contents = content.guidance.contents %}
{% include 'partials/contents.html' %}
{% else %}
<p class="ons-u-mb-s">{{ _("Your answers will be processed in the next few weeks.") }}
{{ _("We may contact you to query your answers via phone or secure message.") }}</p>
<p class="ons-u-mb-s">{{ _("For more information on how we use this data.") }}<br>
<a href="https://www.ons.gov.uk/surveys">https://www.ons.gov.uk/surveys</a></p>
<p class="ons-u-mb-s">{{ _("Your response will help inform decision-makers how best to support the UK population and economy.") }}</p>
<p class="ons-u-mb-s"><a href="https://www.ons.gov.uk/surveys">{{ _("Learn more about how we use this data") }}</a></p>
{% endif %}

{% set countdown_expired_text = _("For security, you can no longer view or get a copy of your answers") %}
Expand Down
4 changes: 3 additions & 1 deletion tests/integration/routes/test_thank_you.py
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,9 @@ def test_default_guidance(self):
self.post()

self.assertInUrl("thank-you")
self.assertInBody("Your answers will be processed in the next few weeks.")
self.assertInBody(
"Your response will help inform decision-makers how best to support the UK population and economy."
)

def test_custom_guidance(self):
self.launchSurvey("test_thank_you")
Expand Down
Loading