diff --git a/app/assets/error_pages/5xx.html b/app/assets/error_pages/5xx.html index 66d27e12f..4787a9393 100644 --- a/app/assets/error_pages/5xx.html +++ b/app/assets/error_pages/5xx.html @@ -4,7 +4,7 @@ - Sorry, there is a problem with the service – US Notify + Sorry, there is a problem with the service – U.S. Notify diff --git a/app/assets/javascripts/analytics/analytics.js b/app/assets/javascripts/analytics/analytics.js index 9f224d450..e589c9859 100644 --- a/app/assets/javascripts/analytics/analytics.js +++ b/app/assets/javascripts/analytics/analytics.js @@ -15,7 +15,7 @@ window.ga('set', 'anonymizeIp', config.anonymizeIp); window.ga('set', 'allowAdFeatures', config.allowAdFeatures); window.ga('set', 'transport', config.transport); - window.ga('set', 'title', 'US Notify'); + window.ga('set', 'title', 'U.S. Notify'); }; diff --git a/app/main/views/add_service.py b/app/main/views/add_service.py index d2424307f..ab1dc95f5 100644 --- a/app/main/views/add_service.py +++ b/app/main/views/add_service.py @@ -35,7 +35,7 @@ def _create_example_template(service_id): example_sms_template = service_api_client.create_service_template( 'Example text message template', 'sms', - 'Hi, I’m trying out US Notify. Today is ((day of week)) and my favourite colour is ((colour)).', + 'Hi, I’m trying out U.S. Notify. Today is ((day of week)) and my favourite colour is ((colour)).', service_id, ) return example_sms_template diff --git a/app/main/views/api_keys.py b/app/main/views/api_keys.py index 0c1c4daff..4df6b833d 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 US Notify." + "You will not be able to use this API key to connect to U.S. 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 d380bdab9..ed9d31ffa 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 US Notify support', + GENERAL_TICKET_TYPE: 'Contact U.S. 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 US Notify support', + GENERAL_TICKET_TYPE: 'Contact U.S. 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 836adf39d..575afbabe 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 US Notify.' + 'This is an example of an email sent using U.S. Notify.' '\n\n' 'https://www.notifications.service.gov.uk' ) diff --git a/app/main/views/send.py b/app/main/views/send.py index 68f4813ea..dbd8db7b6 100644 --- a/app/main/views/send.py +++ b/app/main/views/send.py @@ -430,7 +430,7 @@ def send_one_off_step(service_id, template_id, step_index): if db_template['template_type'] == 'email': email_reply_to = get_email_reply_to_address_from_session() elif db_template['template_type'] == 'sms': - sms_sender = get_sms_sender_from_session() # TODO: verify default sender is US Notify + sms_sender = get_sms_sender_from_session() # TODO: verify default sender is U.S. Notify template_values = get_recipient_and_placeholders_from_session(db_template['template_type']) diff --git a/app/s3_client/s3_mou_client.py b/app/s3_client/s3_mou_client.py index dd203e973..b18c5c968 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 = 'US Notify data sharing and financial agreement{}.pdf'.format( + attachment_filename = 'U.S. 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 3c6cd9fe2..ce3b976eb 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 %} – US Notify + {% block per_page_title %}{% endblock %} – U.S. Notify {% endblock %} {% block bodyStart %} diff --git a/app/templates/error/401.html b/app/templates/error/401.html index 72e56270b..64f9b155b 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 US Notify and try again.

+

Sign in to U.S. Notify and try again.

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

- Sorry, there’s a problem with US Notify + Sorry, there’s a problem with U.S. Notify

Try again later. diff --git a/app/templates/partials/jobs/status.html b/app/templates/partials/jobs/status.html index d9b730b4f..04b411c7b 100644 --- a/app/templates/partials/jobs/status.html +++ b/app/templates/partials/jobs/status.html @@ -15,7 +15,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 US Notify team to raise the limit. + Upload this spreadsheet again tomorrow or contact the U.S. Notify team to raise the limit.

{% endif %}
diff --git a/app/templates/views/accessibility_statement.html b/app/templates/views/accessibility_statement.html index daed0fe59..fc6502baa 100644 --- a/app/templates/views/accessibility_statement.html +++ b/app/templates/views/accessibility_statement.html @@ -19,7 +19,7 @@ ) }}

- This accessibility statement applies to the US Notify domain. + This accessibility statement applies to the U.S. Notify domain.

@@ -66,7 +66,7 @@

Feedback and contact information

- If you need any part of this service in a different format like large print, audio recording or braille, contact the US Notify team. + If you need any part of this service in a different format like large print, audio recording or braille, contact the U.S. Notify team.

@@ -76,7 +76,7 @@

Reporting accessibility problems with this website

- We’re always looking to improve the accessibility of this website. If you find any problems not listed on this page or think we’re not meeting accessibility requirements, contact the US Notify team. + We’re always looking to improve the accessibility of this website. If you find any problems not listed on this page or think we’re not meeting accessibility requirements, contact the U.S. Notify team.

Technical information about this website’s accessibility

@@ -88,7 +88,7 @@

- US Notify is partially compliant with the Web Content Accessibility Guidelines (WCAG) version 2.1 AA standard, due to the non-compliances listed below. + U.S. Notify is partially compliant with the Web Content Accessibility Guidelines (WCAG) version 2.1 AA standard, due to the non-compliances listed below.

Non-accessible content

@@ -195,6 +195,6 @@

- We decided which pages to test based on the most common tasks that US Notify users need to complete. We also tested a sample of pages with common user interface components. + We decided which pages to test based on the most common tasks that U.S. Notify users need to complete. We also tested a sample of pages with common user interface components.

--> {% endblock %} diff --git a/app/templates/views/agreement/agreement-confirm.html b/app/templates/views/agreement/agreement-confirm.html index 021147d79..965e06fc9 100644 --- a/app/templates/views/agreement/agreement-confirm.html +++ b/app/templates/views/agreement/agreement-confirm.html @@ -24,11 +24,11 @@ {% if current_service.organisation.agreement_signed_on_behalf_of_name and current_service.organisation.agreement_signed_on_behalf_of_email_address %}

- I confirm that I have the legal authority to accept the US Notify data sharing and financial agreement (version {{ current_service.organisation.agreement_signed_version }}) on behalf of {{ current_service.organisation.agreement_signed_on_behalf_of_name }} ({{ current_service.organisation.agreement_signed_on_behalf_of_email_address }}) and that {{ current_service.organisation.name }} will be bound by it. + I confirm that I have the legal authority to accept the U.S. Notify data sharing and financial agreement (version {{ current_service.organisation.agreement_signed_version }}) on behalf of {{ current_service.organisation.agreement_signed_on_behalf_of_name }} ({{ current_service.organisation.agreement_signed_on_behalf_of_email_address }}) and that {{ current_service.organisation.name }} will be bound by it.

{% else %}

- I confirm that I have the legal authority to accept the US Notify data sharing and financial agreement (version {{ current_service.organisation.agreement_signed_version }}) and that {{ current_service.organisation.name }} will be bound by it. + I confirm that I have the legal authority to accept the U.S. Notify data sharing and financial agreement (version {{ current_service.organisation.agreement_signed_version }}) and that {{ current_service.organisation.name }} will be bound by it.

{% endif %} diff --git a/app/templates/views/agreement/agreement-public.html b/app/templates/views/agreement/agreement-public.html index c9ec8f549..6bcf39e48 100644 --- a/app/templates/views/agreement/agreement-public.html +++ b/app/templates/views/agreement/agreement-public.html @@ -2,7 +2,7 @@ {% from "components/sub-navigation.html" import sub_navigation %} {% block per_page_title %} - Download the US Notify data sharing and financial agreement + Download the U.S. Notify data sharing and financial agreement {% endblock %} {% block maincolumn_content %} @@ -11,7 +11,7 @@

- Download the US Notify data sharing and financial agreement + Download the U.S. Notify data sharing and financial agreement

diff --git a/app/templates/views/agreement/service-agreement-choose.html b/app/templates/views/agreement/service-agreement-choose.html index 0257dbb55..a26620893 100644 --- a/app/templates/views/agreement/service-agreement-choose.html +++ b/app/templates/views/agreement/service-agreement-choose.html @@ -18,7 +18,7 @@ {{ page_header('Accept the data sharing and financial agreement')}}

- Before you can use US Notify, you need to accept our data sharing and financial agreement. + Before you can use U.S. Notify, you need to accept our data sharing and financial agreement.

This must be done by, or on behalf of, someone with the authority to sign contracts for your organisation. diff --git a/app/templates/views/agreement/service-agreement.html b/app/templates/views/agreement/service-agreement.html index d9465fd49..791f4f444 100644 --- a/app/templates/views/agreement/service-agreement.html +++ b/app/templates/views/agreement/service-agreement.html @@ -19,7 +19,7 @@ {{ page_header('Accept our data sharing and financial agreement')}}

- Before you can use US Notify, you need to accept our data sharing and financial agreement. + Before you can use U.S. Notify, you need to accept our data sharing and financial agreement.

This must be done by, or on behalf of, someone with the authority to sign contracts for {{ current_service.organisation.name }}. diff --git a/app/templates/views/cookies.html b/app/templates/views/cookies.html index e2aa48070..0efd5630e 100644 --- a/app/templates/views/cookies.html +++ b/app/templates/views/cookies.html @@ -21,7 +21,7 @@

Cookies are small files saved on your phone, tablet or computer when you visit a website.

-

We use cookies to make US Notify work and collect information about how you use our service.

+

We use cookies to make U.S. Notify work and collect information about how you use our service.

Essential cookies

@@ -73,7 +73,7 @@ Google Analytics stores anonymised information about:

    -
  • how you got to US Notify
    • +
  • how you got to U.S. Notify
  • the pages you visit on Notify and how long you spend on them
  • any errors you see while using Notify
diff --git a/app/templates/views/documentation.html b/app/templates/views/documentation.html index 34e6edec2..663923cff 100644 --- a/app/templates/views/documentation.html +++ b/app/templates/views/documentation.html @@ -7,7 +7,7 @@ {% block content_column_content %}

Documentation

-

This documentation is for developers who want to integrate the US Notify API with a web application or back office system.

+

This documentation is for developers who want to integrate the U.S. Notify API with a web application or back office system.

Client libraries

Links to documentation open in a new tab.

    diff --git a/app/templates/views/features.html b/app/templates/views/features.html index 2d94d1ab8..a541baef7 100644 --- a/app/templates/views/features.html +++ b/app/templates/views/features.html @@ -9,7 +9,7 @@ {% block content_column_content %}

    Features

    -

    If you work for the federal government, you can use US Notify to keep your users updated.

    +

    If you work for the federal government, you can use U.S. Notify to keep your users updated.

    Notify makes it easy to create, customize, and send text messages.

    diff --git a/app/templates/views/privacy.html b/app/templates/views/privacy.html index 4413136b3..14b736d0b 100644 --- a/app/templates/views/privacy.html +++ b/app/templates/views/privacy.html @@ -19,14 +19,14 @@

    Who we are

    -

    US Notify is a service that lets public service teams in the United States send text messages +

    U.S. Notify is a service that lets public service teams in the United States send text messages to users of their service.

    -

    US Notify is provided by the TTS Public Benefits Studio, which is part of the General Services Administration (GSA).

    +

    U.S. Notify is provided by the TTS Public Benefits Studio, which is part of the General Services Administration (GSA).

    What data we collect from you

    -

    The personal data we collect from public sector employees that create a US Notify account includes:

    +

    The personal data we collect from public sector employees that create a U.S. Notify account includes:

    • your name
      • @@ -36,11 +36,11 @@

      Why we need your data

      -

      We need your personal data to ensure that only legitimate users of US Notify can use it to send notifications.

      +

      We need your personal data to ensure that only legitimate users of U.S. Notify can use it to send notifications.

      What we do with your data

      -

      We use your data to check that you are allowed to access US Notify and to record your activity when using it. We use third party suppliers to do this.

      +

      We use your data to check that you are allowed to access U.S. Notify and to record your activity when using it. We use third party suppliers to do this.

      We will not:

      @@ -53,7 +53,7 @@

      How long we keep your data

      -

      We will retain your personal data for as long as you have a US Notify account.

      +

      We will retain your personal data for as long as you have a U.S. Notify account.

      Where your data is processed and stored

      diff --git a/app/templates/views/security.html b/app/templates/views/security.html index 987a81cdf..e4f6ee165 100644 --- a/app/templates/views/security.html +++ b/app/templates/views/security.html @@ -8,7 +8,7 @@ {% block content_column_content %}

      Security

      -

      US Notify is built for the needs of government services. It has processes in place to:

      +

      U.S. Notify is built for the needs of government services. It has processes in place to:

      • protect user data
      • keep systems secure
        • diff --git a/app/templates/views/service-settings/branding/email-branding-govuk-org.html b/app/templates/views/service-settings/branding/email-branding-govuk-org.html index f0dd80db8..38d4e0d2e 100644 --- a/app/templates/views/service-settings/branding/email-branding-govuk-org.html +++ b/app/templates/views/service-settings/branding/email-branding-govuk-org.html @@ -18,10 +18,10 @@ {{ page_header('Before you request new branding') }} -

        You can only use US Notifybranding if people go to US Notifyto access your service.

        +

        You can only use U.S. Notify branding if people go to U.S. Notify to access your service.

        - You cannot use US Notifybranding if your organisation is + You cannot use U.S. Notify branding if your organisation is independent from government. diff --git a/app/templates/views/service-settings/branding/email-branding-govuk.html b/app/templates/views/service-settings/branding/email-branding-govuk.html index 2d895ba53..458f00a0c 100644 --- a/app/templates/views/service-settings/branding/email-branding-govuk.html +++ b/app/templates/views/service-settings/branding/email-branding-govuk.html @@ -27,10 +27,10 @@

        Before you continue

        -

        You can only use US Notifybranding if people go to US Notifyto access your service.

        +

        You can only use U.S. Notify branding if people go to U.S. Notify to access your service.

        - You cannot use US Notifybranding if your organisation is + You cannot use U.S. Notify branding if your organisation is independent from government. diff --git a/app/templates/views/service-settings/set-email.html b/app/templates/views/service-settings/set-email.html index 8f2286154..018144dd1 100644 --- a/app/templates/views/service-settings/set-email.html +++ b/app/templates/views/service-settings/set-email.html @@ -18,7 +18,7 @@

        {{ page_header('Send emails') }}

        - It’s free to send emails through US Notify. + It’s free to send emails through U.S. Notify.

        {% call form_wrapper() %} {{ form.enabled }} diff --git a/app/templates/views/signedout.html b/app/templates/views/signedout.html index 32e2aa81b..454dfa5de 100644 --- a/app/templates/views/signedout.html +++ b/app/templates/views/signedout.html @@ -2,11 +2,11 @@ {% from "components/button/macro.njk" import govukButton %} {% block meta %} - + {% endblock %} {% block pageTitle %} - US Notify + U.S. Notify {% endblock %} {% block content %} @@ -19,7 +19,7 @@ TTS Solutions
      • - US Notify + U.S. Notify
        • @@ -29,7 +29,7 @@ Send text messages and email to your users

        - Try US Notify now if you work in federal, state or local government. + Try U.S. Notify now if you work in federal, state or local government.

        {{ govukButton({ @@ -83,7 +83,7 @@
        A screenshot of US Notify showing counts of emails and text messages sent
        @@ -105,7 +105,7 @@

        - Integrate the US Notify API with your web application or + Integrate the U.S. Notify API with your web application or back office system.

        -

        Who’s using US Notify

        +

        Who’s using U.S. Notify

        There are @@ -174,7 +174,7 @@ The team

        - US Notify is built and maintained by the Public Benefits Studio, within the General Services Administration's Technology Transformation Services. + U.S. Notify is built and maintained by the Public Benefits Studio, within the General Services Administration's Technology Transformation Services.

        Contact us if you have a question or want @@ -184,7 +184,7 @@

        A photo of the US Notify team gathered around a big screen. One team member is pointing at a graph on the screen.
        diff --git a/app/templates/views/support/form.html b/app/templates/views/support/form.html index ea4372dd8..7f2942b08 100644 --- a/app/templates/views/support/form.html +++ b/app/templates/views/support/form.html @@ -22,7 +22,7 @@

        Check our system status - page to see if there are any known issues with US Notify. + page to see if there are any known issues with U.S. Notify.

        {% endif %} diff --git a/app/templates/views/support/index.html b/app/templates/views/support/index.html index be8d9dfcc..4ced7cafb 100644 --- a/app/templates/views/support/index.html +++ b/app/templates/views/support/index.html @@ -14,7 +14,7 @@

        You can expect a response within 1 business day.

        - +