diff --git a/app/assets/error_pages/5xx.html b/app/assets/error_pages/5xx.html index 79041dfa5..45c6a635f 100644 --- a/app/assets/error_pages/5xx.html +++ b/app/assets/error_pages/5xx.html @@ -1,128 +1,122 @@ - - - - Sorry, there is a problem with the service – GOV.UK Notify - - - - - - - - - - + + + + Sorry, there is a problem with the service – US Notify + + + + - - - + + + + + + - - - - Skip to main content - + +
+
+
+
+

+ Sorry, there is a problem with the service +

+

+ Try again later. +

+

+ You can check our system status page to see if there are any known + issues.
To report a problem, email gov-uk-notify-support@digital.cabinet-office.gov.uk

- +
+
- - + + + + + \ No newline at end of file diff --git a/app/assets/javascripts/analytics/analytics.js b/app/assets/javascripts/analytics/analytics.js index a776f93a2..10400f162 100644 --- a/app/assets/javascripts/analytics/analytics.js +++ b/app/assets/javascripts/analytics/analytics.js @@ -15,16 +15,18 @@ window.ga('set', 'anonymizeIp', config.anonymizeIp); window.ga('set', 'allowAdFeatures', config.allowAdFeatures); window.ga('set', 'transport', config.transport); - window.ga('set', 'title', 'GOV.UK Notify'); + window.ga('set', 'title', 'US Notify'); }; Analytics.load = function () { /* jshint ignore:start */ - (function(i, s, o, g, r, a, m){ i['GoogleAnalyticsObject'] = r; i[r] = i[r] || function () { - (i[r].q = i[r].q || []).push(arguments) }, i[r].l = 1 * new Date(); a = s.createElement(o), - m = s.getElementsByTagName(o)[0]; a.async = 1; a.src = g; m.parentNode.insertBefore(a,m) - })(window,document,'script','//www.google-analytics.com/analytics.js','ga'); + (function (i, s, o, g, r, a, m) { + i['GoogleAnalyticsObject'] = r; i[r] = i[r] || function () { + (i[r].q = i[r].q || []).push(arguments) + }, i[r].l = 1 * new Date(); a = s.createElement(o), + m = s.getElementsByTagName(o)[0]; a.async = 1; a.src = g; m.parentNode.insertBefore(a, m) + })(window, document, 'script', '//www.google-analytics.com/analytics.js', 'ga'); /* jshint ignore:end */ }; diff --git a/app/assets/javascripts/modules/all.mjs b/app/assets/javascripts/modules/all.mjs index 33af699f4..6312f03dc 100644 --- a/app/assets/javascripts/modules/all.mjs +++ b/app/assets/javascripts/modules/all.mjs @@ -21,7 +21,7 @@ import morphdom from 'morphdom'; * This seems to fail in IE8, requires more investigation. * See: https://github.com/imagitama/nodelist-foreach-polyfill */ -function nodeListForEach (nodes, callback) { +function nodeListForEach(nodes, callback) { if (window.NodeList.prototype.forEach) { return nodes.forEach(callback) } @@ -32,11 +32,11 @@ function nodeListForEach (nodes, callback) { // Copy of the initAll function from https://github.com/alphagov/govuk-frontend/blob/v2.13.0/src/all.js // except it only includes, and initialises, the components used by this application. -function initAll (options) { +function initAll(options) { // Set the options to an empty object by default if no options are passed. options = typeof options !== 'undefined' ? options : {} - // Allow the user to initialise GOV.UK Frontend in only certain sections of the page + // Allow the user to initialise US Frontend in only certain sections of the page // Defaults to the entire document if nothing is set. var scope = typeof options.scope !== 'undefined' ? options.scope : document diff --git a/app/main/_commonly_used_passwords.py b/app/main/_commonly_used_passwords.py index f30052d77..4541e46a8 100644 --- a/app/main/_commonly_used_passwords.py +++ b/app/main/_commonly_used_passwords.py @@ -1,9 +1,8 @@ commonly_used_passwords = [ - 'govuknotify', - 'GOVUKnotify', - 'GOV.UK Notify', - 'GOV.UK notify', - 'gov.uk notify' + 'usnotify', + 'USnotify', + 'us Notify', + 'us notify' ] + [ '11111111', '12345678', diff --git a/app/main/views/api_keys.py b/app/main/views/api_keys.py index 840a753b4..37fffb720 100644 --- a/app/main/views/api_keys.py +++ b/app/main/views/api_keys.py @@ -125,7 +125,7 @@ def revoke_api_key(service_id, key_id): if request.method == 'GET': flash([ "Are you sure you want to revoke ‘{}’?".format(key_name), - "You will not be able to use this API key to connect to GOV.UK Notify." + "You will not be able to use this API key to connect to US Notify." ], 'revoke this API key') return render_template( 'views/api/keys.html', diff --git a/app/main/views/feedback.py b/app/main/views/feedback.py index f76f6e95e..d380bdab9 100644 --- a/app/main/views/feedback.py +++ b/app/main/views/feedback.py @@ -76,7 +76,7 @@ def triage(ticket_type=PROBLEM_TICKET_TYPE): form=form, page_title={ PROBLEM_TICKET_TYPE: 'Report a problem', - GENERAL_TICKET_TYPE: 'Contact GOV.UK Notify support', + GENERAL_TICKET_TYPE: 'Contact US Notify support', }.get(ticket_type) ) @@ -151,7 +151,7 @@ def feedback(ticket_type): ), show_status_page_banner=(ticket_type == PROBLEM_TICKET_TYPE), page_title={ - GENERAL_TICKET_TYPE: 'Contact GOV.UK Notify support', + GENERAL_TICKET_TYPE: 'Contact US Notify support', PROBLEM_TICKET_TYPE: 'Report a problem', QUESTION_TICKET_TYPE: 'Ask a question or give feedback', }.get(ticket_type), diff --git a/app/main/views/index.py b/app/main/views/index.py index b997ee232..6b1dae713 100644 --- a/app/main/views/index.py +++ b/app/main/views/index.py @@ -133,7 +133,7 @@ def email_template(): '\n' '10. Three' '\n\n' - 'This is an example of an email sent using GOV.UK Notify.' + 'This is an example of an email sent using US Notify.' '\n\n' 'https://www.notifications.service.gov.uk' ) diff --git a/app/s3_client/s3_mou_client.py b/app/s3_client/s3_mou_client.py index b6921df66..dd203e973 100644 --- a/app/s3_client/s3_mou_client.py +++ b/app/s3_client/s3_mou_client.py @@ -7,7 +7,7 @@ from app.s3_client.s3_logo_client import get_s3_object def get_mou(organisation_is_crown): bucket = current_app.config['MOU_BUCKET_NAME'] filename = 'crown.pdf' if organisation_is_crown else 'non-crown.pdf' - attachment_filename = 'GOV.UK Notify data sharing and financial agreement{}.pdf'.format( + attachment_filename = 'US Notify data sharing and financial agreement{}.pdf'.format( '' if organisation_is_crown else ' (non-crown)' ) try: diff --git a/app/templates/admin_template.html b/app/templates/admin_template.html index 480a9770e..39a7ccd82 100644 --- a/app/templates/admin_template.html +++ b/app/templates/admin_template.html @@ -34,7 +34,7 @@ {% endblock %} {% block pageTitle %} - {% block per_page_title %}{% endblock %} – GOV.UK Notify + {% block per_page_title %}{% endblock %} – US Notify {% endblock %} {% block bodyStart %} diff --git a/app/templates/error/401.html b/app/templates/error/401.html index 86487df99..72e56270b 100644 --- a/app/templates/error/401.html +++ b/app/templates/error/401.html @@ -4,6 +4,6 @@

You’re not authorised to see this page

-

Sign in to GOV.UK Notify and try again.

+

Sign in to US Notify and try again.

{% endblock %} diff --git a/app/templates/error/500.html b/app/templates/error/500.html index 662b2c202..dff42f48f 100644 --- a/app/templates/error/500.html +++ b/app/templates/error/500.html @@ -4,7 +4,7 @@

- Sorry, there’s a problem with GOV.UK Notify + Sorry, there’s a problem with US Notify

Try again later. diff --git a/app/templates/partials/jobs/status.html b/app/templates/partials/jobs/status.html index 94be44736..86f360d39 100644 --- a/app/templates/partials/jobs/status.html +++ b/app/templates/partials/jobs/status.html @@ -25,7 +25,7 @@ Notify cannot send these messages because you have reached your daily limit. You can only send {{ current_service.message_limit|format_thousands }} messages per day.

- Upload this spreadsheet again tomorrow or contact the GOV.UK Notify team to raise the limit. + Upload this spreadsheet again tomorrow or contact the US Notify team to raise the limit.

{% endif %}
diff --git a/app/templates/views/accessibility_statement.html b/app/templates/views/accessibility_statement.html index f7a2f0f31..4f7ebc9b8 100644 --- a/app/templates/views/accessibility_statement.html +++ b/app/templates/views/accessibility_statement.html @@ -19,11 +19,11 @@ ) }}

- This accessibility statement applies to the www.notifications.service.gov.uk domain. It does not apply to the GOV.UK Notify API documentation subdomain. + This accessibility statement applies to the us notify domain. It does not apply to the US Notify API documentation subdomain.

- This website is run by the GOV.UK Notify team at the Government Digital Service (GDS). It is designed to be used by as many people as possible. You should be able to: + This website is run by the US Notify team at the Government Digital Service (GDS). It is designed to be used by as many people as possible. You should be able to:

diff --git a/app/templates/views/templates/action_blocked.html b/app/templates/views/templates/action_blocked.html index 3923e8c97..7e0790885 100644 --- a/app/templates/views/templates/action_blocked.html +++ b/app/templates/views/templates/action_blocked.html @@ -21,7 +21,7 @@

If you need to send {{ 999|message_count_label(notification_type, suffix='') }} - get in touch with the GOV.UK Notify team. + get in touch with the US Notify team.

diff --git a/app/templates/views/terms-of-use.html b/app/templates/views/terms-of-use.html index 3080ab3b5..3a4b45133 100644 --- a/app/templates/views/terms-of-use.html +++ b/app/templates/views/terms-of-use.html @@ -10,7 +10,7 @@

Terms of use

- These terms apply to your service’s use of GOV.UK Notify. You must be the service manager to accept them. + These terms apply to your service’s use of US Notify. You must be the service manager to accept them.

When using Notify

@@ -22,7 +22,7 @@
  • get the right levels of consent (to send messages and to use data)
  • not send unsolicited messages, only ones related to a transaction or something the user has subscribed to be updated about (check the Service Manual if you’re not sure)
  • - send messages that meet the GOV.UK Service Manual standards for writing text messages and emails
    • + send messages that meet the US NotifyService Manual standards for writing text messages and emails
  • check that the data you add to Notify is accurate and complies with data protection legislation

    • If you do not keep to these terms, we might have to stop sending your messages.

    diff --git a/app/templates/views/trial-mode.html b/app/templates/views/trial-mode.html index fa942a0c2..4fb808af6 100644 --- a/app/templates/views/trial-mode.html +++ b/app/templates/views/trial-mode.html @@ -8,7 +8,7 @@

    Trial mode

    -

    When you add a new service it will start in trial mode. This lets you try out GOV.UK Notify, with a few restrictions.

    +

    When you add a new service it will start in trial mode. This lets you try out US Notify, with a few restrictions.

    While your service is in trial mode you can only: