From f8daea18792583060b81ebd8a53439a6b2926806 Mon Sep 17 00:00:00 2001 From: Tim Lowden Date: Tue, 20 Dec 2022 09:44:33 -0500 Subject: [PATCH] Updating for US English Words found: personalis* customis* organis* colour behaviour --- app/main/forms.py | 10 +++++----- app/main/validators.py | 2 +- app/main/views/add_service.py | 2 +- app/main/views/organisations.py | 8 ++++---- app/main/views/send.py | 2 +- app/main/views/templates.py | 2 +- .../uk_components/back-link/README.md | 2 +- .../components/uk_components/button/README.md | 2 +- .../uk_components/checkboxes/README.md | 2 +- .../components/uk_components/details/README.md | 2 +- .../uk_components/error-message/README.md | 2 +- .../uk_components/fieldset/README.md | 2 +- .../components/uk_components/footer/README.md | 2 +- .../components/uk_components/header/README.md | 2 +- .../components/uk_components/hint/README.md | 2 +- .../components/uk_components/input/README.md | 2 +- .../uk_components/inset-text/README.md | 2 +- .../components/uk_components/label/README.md | 2 +- .../components/uk_components/radios/README.md | 2 +- .../uk_components/skip-link/README.md | 2 +- .../uk_components/textarea/README.md | 2 +- .../templates/guidance-personalisation.html | 4 ++-- .../views/agreement/agreement-public.html | 2 +- .../agreement/service-agreement-choose.html | 8 ++++---- .../agreement/service-agreement-signed.html | 6 +++--- .../views/agreement/service-agreement.html | 2 +- app/templates/views/features/emails.html | 4 ++-- .../guidance/branding-and-customisation.html | 4 ++-- .../guidance/edit-and-format-messages.html | 4 ++-- app/templates/views/guidance/index.html | 2 +- app/templates/views/organisations/index.html | 2 +- .../organisations/organisation/billing.html | 2 +- .../pricing/billing-details-signed-out.html | 2 +- app/templates/views/pricing/how-to-pay.html | 10 +++++----- app/templates/views/send-contact-list.html | 2 +- app/templates/views/service-settings.html | 4 ++-- .../branding/email-branding-govuk-org.html | 2 +- .../branding/email-branding-govuk.html | 2 +- .../link-service-to-organisation.html | 4 ++-- app/templates/views/signedout.html | 2 +- app/templates/views/templates/template.html | 6 +++--- app/templates/views/terms-of-use.html | 2 +- .../views/organisations/test_organisations.py | 16 ++++++++-------- tests/app/main/views/test_add_service.py | 2 +- tests/app/main/views/test_send.py | 2 +- tests/app/main/views/test_templates.py | 18 +++++++++--------- 46 files changed, 85 insertions(+), 85 deletions(-) diff --git a/app/main/forms.py b/app/main/forms.py index 43783cd23..d4be5ae73 100644 --- a/app/main/forms.py +++ b/app/main/forms.py @@ -1138,17 +1138,17 @@ class RenameOrganisationForm(StripWhitespaceForm): validators=[ DataRequired(message='Cannot be empty'), MustContainAlphanumericCharacters(), - Length(max=255, message='Organisation name must be 255 characters or fewer') + Length(max=255, message='Organization name must be 255 characters or fewer') ]) class OrganisationOrganisationTypeForm(StripWhitespaceForm): - organisation_type = OrganisationTypeField('What type of organisation is this?') + organisation_type = OrganisationTypeField('What type of organization is this?') class OrganisationCrownStatusForm(StripWhitespaceForm): crown_status = GovukRadiosField( - 'Is this organisation a crown body?', + 'Is this organization a crown body?', choices=[ ('crown', 'Yes'), ('non-crown', 'No'), @@ -1160,7 +1160,7 @@ class OrganisationCrownStatusForm(StripWhitespaceForm): class OrganisationAgreementSignedForm(StripWhitespaceForm): agreement_signed = GovukRadiosField( - 'Has this organisation signed the agreement?', + 'Has this organization signed the agreement?', choices=[ ('yes', 'Yes'), ('no', 'No'), @@ -1169,7 +1169,7 @@ class OrganisationAgreementSignedForm(StripWhitespaceForm): thing='whether this organisation has signed the agreement', param_extensions={ 'items': [ - {'hint': {'html': 'Users will be told their organisation has already signed the agreement'}}, + {'hint': {'html': 'Users will be told their organization has already signed the agreement'}}, {'hint': {'html': 'Users will be prompted to sign the agreement before they can go live'}}, {'hint': {'html': 'Users will not be prompted to sign the agreement'}} ] diff --git a/app/main/validators.py b/app/main/validators.py index 3b1d5ab61..894370187 100644 --- a/app/main/validators.py +++ b/app/main/validators.py @@ -130,7 +130,7 @@ class OnlySMSCharacters: # def __init__(self, message=None): # self.message = message or ( -# 'You can’t use ((double brackets)) to personalise this message' +# 'You can’t use ((double brackets)) to personalize this message' # ) # def __call__(self, form, field): diff --git a/app/main/views/add_service.py b/app/main/views/add_service.py index ab1dc95f5..b1f1c2f85 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 U.S. 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 color is ((color)).', service_id, ) return example_sms_template diff --git a/app/main/views/organisations.py b/app/main/views/organisations.py index fbe5f6fcd..82d98fc05 100644 --- a/app/main/views/organisations.py +++ b/app/main/views/organisations.py @@ -63,9 +63,9 @@ def add_organisation(): org_id=Organisation.create_from_form(form).id, )) except HTTPError as e: - msg = 'Organisation name already exists' + msg = 'Organization name already exists' if e.status_code == 400 and msg in e.message: - form.name.errors.append("This organisation name is already in use") + form.name.errors.append("This organization name is already in use") else: raise e @@ -243,9 +243,9 @@ def edit_organisation_name(org_id): try: current_organisation.update(name=form.name.data) except HTTPError as http_error: - error_msg = 'Organisation name already exists' + error_msg = 'Organization name already exists' if http_error.status_code == 400 and error_msg in http_error.message: - form.name.errors.append('This organisation name is already in use') + form.name.errors.append('This organization name is already in use') else: raise http_error else: diff --git a/app/main/views/send.py b/app/main/views/send.py index 08876d777..cc37f5427 100644 --- a/app/main/views/send.py +++ b/app/main/views/send.py @@ -627,7 +627,7 @@ def all_placeholders_in_session(placeholders): def get_send_test_page_title(template_type, entering_recipient, name=None): if entering_recipient: return 'Send ‘{}’'.format(name) - return 'Personalise this message' + return 'Personalize this message' def get_back_link(service_id, template, step_index, placeholders=None): diff --git a/app/main/views/templates.py b/app/main/views/templates.py index 793885e5b..68d8621b2 100644 --- a/app/main/views/templates.py +++ b/app/main/views/templates.py @@ -666,7 +666,7 @@ def redact_template(service_id, template_id): service_api_client.redact_service_template(service_id, template_id) flash( - 'Personalised content will be hidden for messages sent with this template', + 'Personalized content will be hidden for messages sent with this template', 'default_with_tick' ) diff --git a/app/templates/components/uk_components/back-link/README.md b/app/templates/components/uk_components/back-link/README.md index 50b5aa2f8..d9b71bbb1 100644 --- a/app/templates/components/uk_components/back-link/README.md +++ b/app/templates/components/uk_components/back-link/README.md @@ -10,6 +10,6 @@ Find out when to use the back link component in your service in the [GOV.UK Desi ## Component options -Use options to customise the appearance, content and behaviour of a component when using a macro, for example, changing the text. +Use options to customize the appearance, content and behavior of a component when using a macro, for example, changing the text. See [options table](https://design-system.service.gov.uk/components/back-link/#options-example-default) for details. \ No newline at end of file diff --git a/app/templates/components/uk_components/button/README.md b/app/templates/components/uk_components/button/README.md index 45425bc11..d8b24dd08 100644 --- a/app/templates/components/uk_components/button/README.md +++ b/app/templates/components/uk_components/button/README.md @@ -10,6 +10,6 @@ Find out when to use the button component in your service in the [GOV.UK Design ## Component options -Use options to customise the appearance, content and behaviour of a component when using a macro, for example, changing the text. +Use options to customize the appearance, content and behavior of a component when using a macro, for example, changing the text. See [options table](https://design-system.service.gov.uk/components/button/#options-example-default) for details. \ No newline at end of file diff --git a/app/templates/components/uk_components/checkboxes/README.md b/app/templates/components/uk_components/checkboxes/README.md index 8f094fa21..908acc899 100644 --- a/app/templates/components/uk_components/checkboxes/README.md +++ b/app/templates/components/uk_components/checkboxes/README.md @@ -10,6 +10,6 @@ Find out when to use the checkboxes component in your service in the [GOV.UK Des ## Component options -Use options to customise the appearance, content and behaviour of a component when using a macro, for example, changing the text. +Use options to customize the appearance, content and behavior of a component when using a macro, for example, changing the text. See [options table](https://design-system.service.gov.uk/components/checkboxes/#options-example-default) for details. \ No newline at end of file diff --git a/app/templates/components/uk_components/details/README.md b/app/templates/components/uk_components/details/README.md index c44486c73..65a59d9c5 100644 --- a/app/templates/components/uk_components/details/README.md +++ b/app/templates/components/uk_components/details/README.md @@ -10,6 +10,6 @@ Find out when to use the details component in your service in the [GOV.UK Design ## Component options -Use options to customise the appearance, content and behaviour of a component when using a macro, for example, changing the text. +Use options to customize the appearance, content and behavior of a component when using a macro, for example, changing the text. See [options table](https://design-system.service.gov.uk/components/details/#options-example-default) for details. \ No newline at end of file diff --git a/app/templates/components/uk_components/error-message/README.md b/app/templates/components/uk_components/error-message/README.md index 909791bda..8e601db74 100644 --- a/app/templates/components/uk_components/error-message/README.md +++ b/app/templates/components/uk_components/error-message/README.md @@ -10,6 +10,6 @@ Find out when to use the error message component in your service in the [GOV.UK ## Component options -Use options to customise the appearance, content and behaviour of a component when using a macro, for example, changing the text. +Use options to customize the appearance, content and behavior of a component when using a macro, for example, changing the text. See [options table](https://design-system.service.gov.uk/components/error-message/#options-example-default) for details. \ No newline at end of file diff --git a/app/templates/components/uk_components/fieldset/README.md b/app/templates/components/uk_components/fieldset/README.md index 77381dc4e..3da88d7e0 100644 --- a/app/templates/components/uk_components/fieldset/README.md +++ b/app/templates/components/uk_components/fieldset/README.md @@ -10,6 +10,6 @@ Find out when to use the fieldset component in your service in the [GOV.UK Desig ## Component options -Use options to customise the appearance, content and behaviour of a component when using a macro, for example, changing the text. +Use options to customize the appearance, content and behavior of a component when using a macro, for example, changing the text. See [options table](https://design-system.service.gov.uk/components/fieldset/#options-example-default) for details. \ No newline at end of file diff --git a/app/templates/components/uk_components/footer/README.md b/app/templates/components/uk_components/footer/README.md index 64b7a45ee..8d1a23b9b 100644 --- a/app/templates/components/uk_components/footer/README.md +++ b/app/templates/components/uk_components/footer/README.md @@ -10,6 +10,6 @@ Find out when to use the footer component in your service in the [GOV.UK Design ## Component options -Use options to customise the appearance, content and behaviour of a component when using a macro, for example, changing the text. +Use options to customize the appearance, content and behavior of a component when using a macro, for example, changing the text. See [options table](https://design-system.service.gov.uk/components/footer/#options-example-default) for details. \ No newline at end of file diff --git a/app/templates/components/uk_components/header/README.md b/app/templates/components/uk_components/header/README.md index 5254d0cb2..5a19ca475 100644 --- a/app/templates/components/uk_components/header/README.md +++ b/app/templates/components/uk_components/header/README.md @@ -10,6 +10,6 @@ Find out when to use the header component in your service in the [GOV.UK Design ## Component options -Use options to customise the appearance, content and behaviour of a component when using a macro, for example, changing the text. +Use options to customize the appearance, content and behavior of a component when using a macro, for example, changing the text. See [options table](https://design-system.service.gov.uk/components/header/#options-example-default) for details. \ No newline at end of file diff --git a/app/templates/components/uk_components/hint/README.md b/app/templates/components/uk_components/hint/README.md index e87a00ab4..3f06b3639 100644 --- a/app/templates/components/uk_components/hint/README.md +++ b/app/templates/components/uk_components/hint/README.md @@ -10,6 +10,6 @@ The label component is used in other input components, to see an example of it i ## Component options -Use options to customise the appearance, content and behaviour of a component when using a macro, for example, changing the text. +Use options to customize the appearance, content and behavior of a component when using a macro, for example, changing the text. See [options table](https://design-system.service.gov.uk/components/file-upload/#options-example-default--hint) for details. \ No newline at end of file diff --git a/app/templates/components/uk_components/input/README.md b/app/templates/components/uk_components/input/README.md index 87211de01..5176633ac 100644 --- a/app/templates/components/uk_components/input/README.md +++ b/app/templates/components/uk_components/input/README.md @@ -10,6 +10,6 @@ Find out when to use the input component in your service in the [GOV.UK Design S ## Component options -Use options to customise the appearance, content and behaviour of a component when using a macro, for example, changing the text. +Use options to customize the appearance, content and behavior of a component when using a macro, for example, changing the text. See [options table](https://design-system.service.gov.uk/components/text-input/#options-example-default) for details. \ No newline at end of file diff --git a/app/templates/components/uk_components/inset-text/README.md b/app/templates/components/uk_components/inset-text/README.md index b13918cd9..4b6d1a614 100644 --- a/app/templates/components/uk_components/inset-text/README.md +++ b/app/templates/components/uk_components/inset-text/README.md @@ -10,6 +10,6 @@ Find out when to use the inset text component in your service in the [GOV.UK Des ## Component options -Use options to customise the appearance, content and behaviour of a component when using a macro, for example, changing the text. +Use options to customize the appearance, content and behavior of a component when using a macro, for example, changing the text. See [options table](https://design-system.service.gov.uk/components/inset-text/#options-example-default) for details. \ No newline at end of file diff --git a/app/templates/components/uk_components/label/README.md b/app/templates/components/uk_components/label/README.md index dd2d7b97e..678dfd9bb 100644 --- a/app/templates/components/uk_components/label/README.md +++ b/app/templates/components/uk_components/label/README.md @@ -10,6 +10,6 @@ The label component is used in other input components, to see an example of it i ## Component options -Use options to customise the appearance, content and behaviour of a component when using a macro, for example, changing the text. +Use options to customize the appearance, content and behavior of a component when using a macro, for example, changing the text. See [options table](https://design-system.service.gov.uk/components/file-upload/#options-example-default--label) for details. \ No newline at end of file diff --git a/app/templates/components/uk_components/radios/README.md b/app/templates/components/uk_components/radios/README.md index 8a0da19cb..27f03c45d 100644 --- a/app/templates/components/uk_components/radios/README.md +++ b/app/templates/components/uk_components/radios/README.md @@ -10,6 +10,6 @@ Find out when to use the radios component in your service in the [GOV.UK Design ## Component options -Use options to customise the appearance, content and behaviour of a component when using a macro, for example, changing the text. +Use options to customize the appearance, content and behavior of a component when using a macro, for example, changing the text. See [options table](https://design-system.service.gov.uk/components/radios/#options-example-default) for details. \ No newline at end of file diff --git a/app/templates/components/uk_components/skip-link/README.md b/app/templates/components/uk_components/skip-link/README.md index df5b1b119..788c0fa43 100644 --- a/app/templates/components/uk_components/skip-link/README.md +++ b/app/templates/components/uk_components/skip-link/README.md @@ -10,6 +10,6 @@ Find out when to use the skip link component in your service in the [GOV.UK Desi ## Component options -Use options to customise the appearance, content and behaviour of a component when using a macro, for example, changing the text. +Use options to customize the appearance, content and behavior of a component when using a macro, for example, changing the text. See [options table](https://design-system.service.gov.uk/components/skip-link/#options-example-default) for details. \ No newline at end of file diff --git a/app/templates/components/uk_components/textarea/README.md b/app/templates/components/uk_components/textarea/README.md index 72abdfb8e..b8a8e0b3e 100644 --- a/app/templates/components/uk_components/textarea/README.md +++ b/app/templates/components/uk_components/textarea/README.md @@ -10,6 +10,6 @@ Find out when to use the textarea component in your service in the [GOV.UK Desig ## Component options -Use options to customise the appearance, content and behaviour of a component when using a macro, for example, changing the text. +Use options to customize the appearance, content and behavior of a component when using a macro, for example, changing the text. See [options table](https://design-system.service.gov.uk/components/textarea/#options-example-default) for details. \ No newline at end of file diff --git a/app/templates/partials/templates/guidance-personalisation.html b/app/templates/partials/templates/guidance-personalisation.html index 7fb8c9c90..8505d7219 100644 --- a/app/templates/partials/templates/guidance-personalisation.html +++ b/app/templates/partials/templates/guidance-personalisation.html @@ -1,10 +1,10 @@ {% from "components/uk_components/inset-text/macro.njk" import govukInsetText %}

- Personalisation + Personalization

- Use double brackets to personalise your message: + Use double brackets to personalize your message:

{{ govukInsetText({ "text": "Hello ((first name)), your reference is ((ref number))", diff --git a/app/templates/views/agreement/agreement-public.html b/app/templates/views/agreement/agreement-public.html index 6bcf39e48..c365c9599 100644 --- a/app/templates/views/agreement/agreement-public.html +++ b/app/templates/views/agreement/agreement-public.html @@ -18,7 +18,7 @@ Download the agreement (PDF){% if owner %} for {{ owner }}{% endif %}.

- The agreement contains commercially sensitive information. Do not share it outside your organisation. + The agreement contains commercially sensitive information. Do not share it outside your organization.

diff --git a/app/templates/views/agreement/service-agreement-choose.html b/app/templates/views/agreement/service-agreement-choose.html index b4df5822b..9622d9114 100644 --- a/app/templates/views/agreement/service-agreement-choose.html +++ b/app/templates/views/agreement/service-agreement-choose.html @@ -21,17 +21,17 @@ 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. + This must be done by, or on behalf of, someone with the authority to sign contracts for your organization.

- Once accepted, the agreement covers all Notify services from your organisation. + Once accepted, the agreement covers all Notify services from your organization.

- There are different agreements for crown and non-crown organisations. + There are different agreements for crown and non-crown organizations.

Contact us to tell us - whether or not you work for a crown organisation. If you’re not sure + whether or not you work for a crown organization. If you’re not sure we’ll help you work it out.

diff --git a/app/templates/views/agreement/service-agreement-signed.html b/app/templates/views/agreement/service-agreement-signed.html index b105fda98..3b3286f72 100644 --- a/app/templates/views/agreement/service-agreement-signed.html +++ b/app/templates/views/agreement/service-agreement-signed.html @@ -3,7 +3,7 @@ {% from "components/uk_components/back-link/macro.njk" import govukBackLink %} {% block service_page_title %} - Your organisation has already accepted the agreement + Your organization has already accepted the agreement {% endblock %} {% block backLink %} @@ -15,14 +15,14 @@
- {{ page_header('Your organisation has already accepted the agreement')}} + {{ page_header('Your organization has already accepted the agreement')}}

{{ current_service.organisation.name }} has already accepted the US Notify data sharing and financial agreement.

- The agreement is confidential and should not be shared outside your organisation. + The agreement is confidential and should not be shared outside your organization.

diff --git a/app/templates/views/agreement/service-agreement.html b/app/templates/views/agreement/service-agreement.html index c61aadbdc..2194c802d 100644 --- a/app/templates/views/agreement/service-agreement.html +++ b/app/templates/views/agreement/service-agreement.html @@ -28,7 +28,7 @@ Once accepted, the agreement covers all Notify services from {{ current_service.organisation.name }}.

- The agreement is confidential and should not be shared outside your organisation. + The agreement is confidential and should not be shared outside your organization.

{{ govukButton({ "element": "a", diff --git a/app/templates/views/features/emails.html b/app/templates/views/features/emails.html index 20caf3f90..372bf1dcc 100644 --- a/app/templates/views/features/emails.html +++ b/app/templates/views/features/emails.html @@ -17,13 +17,13 @@

Notify makes it easy to:

You can also integrate with our API to send emails automatically.

Email branding

-

Add your organisation’s logo and brand colour to email templates.

+

Add your organization’s logo and brand color to email templates.

See how to change your email branding.

Send files by email

diff --git a/app/templates/views/guidance/branding-and-customisation.html b/app/templates/views/guidance/branding-and-customisation.html index ef50f7e16..342eb310d 100644 --- a/app/templates/views/guidance/branding-and-customisation.html +++ b/app/templates/views/guidance/branding-and-customisation.html @@ -2,12 +2,12 @@ {% from "components/service-link.html" import service_link %} {% block per_page_title %} - Branding and customisation + Branding and customization {% endblock %} {% block content_column_content %} -

Branding and customisation

+

Branding and customization

This page explains how to:

diff --git a/app/templates/views/guidance/edit-and-format-messages.html b/app/templates/views/guidance/edit-and-format-messages.html index 4fb558636..605dec74f 100644 --- a/app/templates/views/guidance/edit-and-format-messages.html +++ b/app/templates/views/guidance/edit-and-format-messages.html @@ -50,9 +50,9 @@
  • you can no longer control where the redirect goes
    • -

    Personalise your content

    +

    Personalize your content

    -

    To personalise the content of your messages, add a placeholder to the template.

    +

    To personalize the content of your messages, add a placeholder to the template.

    Placeholders are filled in with details, like a name or reference number, each time you send a message.

    diff --git a/app/templates/views/guidance/index.html b/app/templates/views/guidance/index.html index 22855cf83..af62d06b4 100644 --- a/app/templates/views/guidance/index.html +++ b/app/templates/views/guidance/index.html @@ -16,7 +16,7 @@ diff --git a/app/templates/views/organisations/index.html b/app/templates/views/organisations/index.html index d1c1c35f6..50ddd949a 100644 --- a/app/templates/views/organisations/index.html +++ b/app/templates/views/organisations/index.html @@ -32,7 +32,7 @@
    {{ govukButton({ "element": "a", - "text": "New organisation", + "text": "New organization", "href": url_for('main.add_organisation'), "classes": "govuk-button--secondary" }) }} diff --git a/app/templates/views/organisations/organisation/billing.html b/app/templates/views/organisations/organisation/billing.html index fe61a52ae..c2b4375bb 100644 --- a/app/templates/views/organisations/organisation/billing.html +++ b/app/templates/views/organisations/organisation/billing.html @@ -15,7 +15,7 @@ {% if current_org.agreement_signed_at %}

    - Your organisation accepted version {{ current_org.agreement_signed_version }} of the U.S. Notify data sharing + Your organization accepted version {{ current_org.agreement_signed_version }} of the U.S. Notify data sharing and financial agreement on {{ current_org.agreement_signed_at | format_date_normal }}.

    diff --git a/app/templates/views/pricing/billing-details-signed-out.html b/app/templates/views/pricing/billing-details-signed-out.html index 9bb6f4711..a260f7bb9 100644 --- a/app/templates/views/pricing/billing-details-signed-out.html +++ b/app/templates/views/pricing/billing-details-signed-out.html @@ -20,7 +20,7 @@

    - You can use this information to add the Cabinet Office as a supplier. Your organisation may need to do this before you can raise a purchase order. + You can use this information to add the Cabinet Office as a supplier. Your organization may need to do this before you can raise a purchase order.

    {% endblock %} diff --git a/app/templates/views/pricing/how-to-pay.html b/app/templates/views/pricing/how-to-pay.html index 258d23c25..cee5de922 100644 --- a/app/templates/views/pricing/how-to-pay.html +++ b/app/templates/views/pricing/how-to-pay.html @@ -22,7 +22,7 @@

    - The Cabinet Office will send your organisation an invoice each quarter if you: + The Cabinet Office will send your organization an invoice each quarter if you:

      @@ -30,7 +30,7 @@

    - If your organisation has more than one Notify service, you’ll see a breakdown of each service on your invoice. + If your organization has more than one Notify service, you’ll see a breakdown of each service on your invoice.

    @@ -50,15 +50,15 @@

    - If your organisation’s total estimated spend is more than £500 per quarter (before VAT), you need to raise a purchase order (PO). + If your organization’s total estimated spend is more than £500 per quarter (before VAT), you need to raise a purchase order (PO).

    - Your organisation should raise a single PO for the estimated cost of all its services. You can update the PO any time if your usage increases. + Your organization should raise a single PO for the estimated cost of all its services. You can update the PO any time if your usage increases.

    - Your organisation may need to add the Cabinet Office as a supplier before you can raise a PO. + Your organization may need to add the Cabinet Office as a supplier before you can raise a PO.

    --> {% endblock %} diff --git a/app/templates/views/send-contact-list.html b/app/templates/views/send-contact-list.html index 23d0216ef..13c4b667c 100644 --- a/app/templates/views/send-contact-list.html +++ b/app/templates/views/send-contact-list.html @@ -22,7 +22,7 @@

    You cannot use an emergency contact list with this template because it - is personalised with {{ list_of_placeholders(template.placeholders) }}. + is personalized with {{ list_of_placeholders(template.placeholders) }}.

    Emergency contact lists can only include email addresses or phone diff --git a/app/templates/views/service-settings.html b/app/templates/views/service-settings.html index d6a08f0a8..44f4a707b 100644 --- a/app/templates/views/service-settings.html +++ b/app/templates/views/service-settings.html @@ -250,7 +250,7 @@ {% call row() %} {{ text_field('Live')}} {% if current_service.trial_mode and not current_service.organisation_id %} - {{ text_field('No (organisation must be set first)') }} + {{ text_field('No (organization must be set first)') }} {{ text_field('') }} {% else %} {{ boolean_field(not current_service.trial_mode) }} @@ -276,7 +276,7 @@ {% endcall %} {% call row() %} - {{ text_field('Organisation')}} + {{ text_field('Organization')}} {% call field() %} {% if current_service.organisation_id %} 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 eb66cdc59..1bb390e31 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 @@ -21,7 +21,7 @@

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

    - You cannot use U.S. Notify branding if your organisation is + You cannot use U.S. Notify branding if your organization 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 c61996513..caeedc7cc 100644 --- a/app/templates/views/service-settings/branding/email-branding-govuk.html +++ b/app/templates/views/service-settings/branding/email-branding-govuk.html @@ -30,7 +30,7 @@

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

    - You cannot use U.S. Notify branding if your organisation is + You cannot use U.S. Notify branding if your organization is independent from government. diff --git a/app/templates/views/service-settings/link-service-to-organisation.html b/app/templates/views/service-settings/link-service-to-organisation.html index e4dd71fd4..1604c3ee2 100644 --- a/app/templates/views/service-settings/link-service-to-organisation.html +++ b/app/templates/views/service-settings/link-service-to-organisation.html @@ -5,7 +5,7 @@ {% from "components/form.html" import form_wrapper %} {% from "components/uk_components/back-link/macro.njk" import govukBackLink %} -{% set page_title = "Link service to organisation" %} +{% set page_title = "Link service to organization" %} {% block service_page_title %} {{ page_title }} @@ -29,7 +29,7 @@ {{ form.organisations }} {{ sticky_page_footer('Save') }} {% else %} -

    No organisations

    +

    No organizations

    {% endif %} {% endcall %} {% endblock %} diff --git a/app/templates/views/signedout.html b/app/templates/views/signedout.html index 3df5bf8fa..124a2c295 100644 --- a/app/templates/views/signedout.html +++ b/app/templates/views/signedout.html @@ -92,7 +92,7 @@

    A screenshot of a spreadsheet with columns for email address, name and colour
    diff --git a/app/templates/views/templates/template.html b/app/templates/views/templates/template.html index cbdbfba51..d0c545744 100644 --- a/app/templates/views/templates/template.html +++ b/app/templates/views/templates/template.html @@ -13,10 +13,10 @@ {% if show_redaction_message %}
    - {% call banner_wrapper(type='dangerous', subhead='Are you sure you want to hide personalisation after sending?') %} + {% call banner_wrapper(type='dangerous', subhead='Are you sure you want to hide personalization after sending?') %}
    • - You will not be able to see personalised content in Notify for this template + You will not be able to see personalized content in Notify for this template
    • You cannot undo this @@ -75,7 +75,7 @@ Hide personalisation after sending {% else %} -

      Personalisation is hidden after sending

      +

      Personalization is hidden after sending

      {% endif %} {% endif %}
    diff --git a/app/templates/views/terms-of-use.html b/app/templates/views/terms-of-use.html index 10b2c8623..007b17b75 100644 --- a/app/templates/views/terms-of-use.html +++ b/app/templates/views/terms-of-use.html @@ -16,7 +16,7 @@

    When using Notify

    You must:

      -
    • complete your organisation’s information assurance process (you do not need to include Notify or our delivery partners, we’ve already done that)
      • +
    • complete your organization’s information assurance process (you do not need to include Notify or our delivery partners, we’ve already done that)
    • tell us immediately if you have any security breaches
    • keep your API keys secure
    • get the right levels of consent (to send messages and to use data)
      • diff --git a/tests/app/main/views/organisations/test_organisations.py b/tests/app/main/views/organisations/test_organisations.py index 8d24f94bd..da157deaf 100644 --- a/tests/app/main/views/organisations/test_organisations.py +++ b/tests/app/main/views/organisations/test_organisations.py @@ -169,8 +169,8 @@ def test_create_new_organisation_validates( for error in page.select('.govuk-error-message') ] == [ ('name', 'Error: Cannot be empty'), - ('organisation_type', 'Error: Select the type of organisation'), - ('crown_status', 'Error: Select whether this organisation is a crown body'), + ('organisation_type', 'Error: Select the type of organization'), + ('crown_status', 'Error: Select whether this organization is a crown body'), ] assert mock_create_organisation.called is False @@ -178,7 +178,7 @@ def test_create_new_organisation_validates( @pytest.mark.parametrize('name, error_message', [ ('', 'Cannot be empty'), ('a', 'at least two alphanumeric characters'), - ('a' * 256, 'Organisation name must be 255 characters or fewer'), + ('a' * 256, 'Organization name must be 255 characters or fewer'), ]) def test_create_new_organisation_fails_with_incorrect_input( client_request, @@ -1318,7 +1318,7 @@ def test_update_organisation_name( @pytest.mark.parametrize('name, error_message', [ ('', 'Cannot be empty'), ('a', 'at least two alphanumeric characters'), - ('a' * 256, 'Organisation name must be 255 characters or fewer'), + ('a' * 256, 'Organization name must be 255 characters or fewer'), ]) def test_update_organisation_with_incorrect_input( client_request, @@ -1352,7 +1352,7 @@ def test_update_organisation_with_non_unique_name( status_code=400, json={'result': 'error', 'message': 'Organisation name already exists'} ), - message='Organisation name already exists', + message='Organization name already exists', ) ) client_request.login(platform_admin_user) @@ -1363,7 +1363,7 @@ def test_update_organisation_with_non_unique_name( _expected_status=200, ) - assert 'This organisation name is already in use' in page.select_one('.govuk-error-message').text + assert 'This organization name is already in use' in page.select_one('.govuk-error-message').text def test_get_edit_organisation_go_live_notes_page( @@ -1436,7 +1436,7 @@ def test_view_edit_organisation_notes( 'main.edit_organisation_notes', org_id=organisation_one['id'], ) - assert page.select_one('h1').text == "Edit organisation notes" + assert page.select_one('h1').text == "Edit organization notes" assert page.find('label', class_="form-label").text.strip() == "Notes" assert page.find('textarea').attrs["name"] == "notes" @@ -1531,7 +1531,7 @@ def test_view_edit_organisation_billing_details( 'main.edit_organisation_billing_details', org_id=organisation_one['id'], ) - assert page.select_one('h1').text == "Edit organisation billing details" + assert page.select_one('h1').text == "Edit organization billing details" labels = page.find_all('label', class_="form-label") labels_list = [ 'Contact email addresses', diff --git a/tests/app/main/views/test_add_service.py b/tests/app/main/views/test_add_service.py index 1494e27ea..b0a67e4da 100644 --- a/tests/app/main/views/test_add_service.py +++ b/tests/app/main/views/test_add_service.py @@ -142,7 +142,7 @@ def test_should_add_service_and_redirect_to_tour_when_no_services( 'sms', ( "Hi, I’m trying out U.S. Notify. Today is " - "((day of week)) and my favourite colour is ((colour))." + "((day of week)) and my favourite color is ((color))." ), 101, ) diff --git a/tests/app/main/views/test_send.py b/tests/app/main/views/test_send.py index a9056f5ce..5f54c8c42 100644 --- a/tests/app/main/views/test_send.py +++ b/tests/app/main/views/test_send.py @@ -2926,7 +2926,7 @@ def test_choose_from_contact_list_with_personalised_template( normalize_spaces(p.text) for p in page.select('main p') ] == [ 'You cannot use an emergency contact list with this template because ' - 'it is personalised with ((name)) and ((thing)).', + 'it is personalized with ((name)) and ((thing)).', 'Emergency contact lists can only include email addresses or phone numbers.', ] assert not page.select('table') diff --git a/tests/app/main/views/test_templates.py b/tests/app/main/views/test_templates.py index fb7fb5e0a..f14df6e84 100644 --- a/tests/app/main/views/test_templates.py +++ b/tests/app/main/views/test_templates.py @@ -1248,11 +1248,11 @@ def test_should_403_when_create_template_with_process_type_of_priority_for_non_p @pytest.mark.parametrize('old_content, new_content, expected_paragraphs', [ ( - "my favourite colour is blue", - "my favourite colour is ((colour))", + "my favourite color is blue", + "my favourite color is ((color))", [ - 'You added ((colour))', - 'Before you send any messages, make sure your API calls include colour.', + 'You added ((color))', + 'Before you send any messages, make sure your API calls include color.', ] ), ( @@ -1833,7 +1833,7 @@ def test_should_show_message_before_redacting_template( ) assert ( - 'Are you sure you want to hide personalisation after sending?' + 'Are you sure you want to hide personalization after sending?' ) in page.select('.banner-dangerous')[0].text form = page.select('.banner-dangerous form')[0] @@ -1859,7 +1859,7 @@ def test_should_show_redact_template( ) assert normalize_spaces(page.select('.banner-default-with-tick')[0].text) == ( - 'Personalised content will be hidden for messages sent with this template' + 'Personalized content will be hidden for messages sent with this template' ) mock_redact_template.assert_called_once_with(SERVICE_ONE_ID, fake_uuid) @@ -1882,7 +1882,7 @@ def test_should_show_hint_once_template_redacted( _test_page_title=False, ) - assert page.select('.hint')[0].text == 'Personalisation is hidden after sending' + assert page.select('.hint')[0].text == 'Personalization is hidden after sending' def test_set_template_sender( @@ -1993,13 +1993,13 @@ def test_set_template_sender( ), ( 'sms', False, 'Hello ((name))', - 'Will be charged as 1 text message (not including personalisation)', + 'Will be charged as 1 text message (not including personalization)', None, ), ( # Length of placeholder body doesn’t count towards fragment count 'sms', False, f'Hello (( {"a" * 999} ))', - 'Will be charged as 1 text message (not including personalisation)', + 'Will be charged as 1 text message (not including personalization)', None, ), ),