{{ 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.
- 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:
- create reusable email templates -
- personalise the content of your emails +
- personalize the content of your emails
- send and schedule bulk messages
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 @@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 @@- edit and format messages -
- add branding and customisation +
- add branding and customization
- send files by email
- 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
 }})
- - 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 %}
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, ), ),