{% block beforeContent %}{% endblock %} {% block content %} - {{ page_header('New organisation') }} + {{ page_header('New organization') }} {% call form_wrapper() %} {{ form.name }} {{ form.organisation_type }} diff --git a/app/templates/views/organisations/index.html b/app/templates/views/organisations/index.html index 50ddd949a..6e00866ed 100644 --- a/app/templates/views/organisations/index.html +++ b/app/templates/views/organisations/index.html @@ -3,12 +3,12 @@ {% from "components/uk_components/button/macro.njk" import govukButton %} {% block per_page_title %} - Organisations + Organizations {% endblock %} {% block platform_admin_content %} -

Organisations

+

Organizations

{{ live_search(target_selector='.browse-list-item', show=True, form=search_form, label='Search by name') }} diff --git a/app/templates/views/organisations/organisation/settings/edit-crown-status.html b/app/templates/views/organisations/organisation/settings/edit-crown-status.html index f9fb4a0aa..6f56ae785 100644 --- a/app/templates/views/organisations/organisation/settings/edit-crown-status.html +++ b/app/templates/views/organisations/organisation/settings/edit-crown-status.html @@ -5,7 +5,7 @@ {% from "components/uk_components/back-link/macro.njk" import govukBackLink %} {% block org_page_title %} - Crown organisation + Crown organization {% endblock %} {% block backLink %} @@ -13,7 +13,7 @@ {% endblock %} {% block maincolumn_content %} - {{ page_header("Crown organisation") }} + {{ page_header("Crown organization") }}
{% call form_wrapper() %} diff --git a/app/templates/views/organisations/organisation/settings/edit-name.html b/app/templates/views/organisations/organisation/settings/edit-name.html index fb8a62f41..6eaca1e6e 100644 --- a/app/templates/views/organisations/organisation/settings/edit-name.html +++ b/app/templates/views/organisations/organisation/settings/edit-name.html @@ -5,7 +5,7 @@ {% from "components/uk_components/back-link/macro.njk" import govukBackLink %} {% block org_page_title %} - Change organisation name + Change organization name {% endblock %} {% block backLink %} @@ -14,7 +14,7 @@ {% block maincolumn_content %} - {{ page_header('Change organisation name') }} + {{ page_header('Change organization name') }} {% call form_wrapper() %} {{ form.name }} diff --git a/app/templates/views/organisations/organisation/settings/edit-type.html b/app/templates/views/organisations/organisation/settings/edit-type.html index e3cf7865e..ebc5bed4a 100644 --- a/app/templates/views/organisations/organisation/settings/edit-type.html +++ b/app/templates/views/organisations/organisation/settings/edit-type.html @@ -5,7 +5,7 @@ {% from "components/uk_components/back-link/macro.njk" import govukBackLink %} {% block org_page_title %} - Organisation sector + Organization sector {% endblock %} {% block backLink %} @@ -13,7 +13,7 @@ {% endblock %} {% block maincolumn_content %} - {{ page_header("Organisation sector") }} + {{ page_header("Organization sector") }} {% call form_wrapper() %} {{ form.organisation_type }} {{ page_footer('Save') }} diff --git a/app/templates/views/organisations/organisation/settings/index.html b/app/templates/views/organisations/organisation/settings/index.html index b1af005b7..8c98e47af 100644 --- a/app/templates/views/organisations/organisation/settings/index.html +++ b/app/templates/views/organisations/organisation/settings/index.html @@ -20,7 +20,7 @@ {{ edit_field( 'Change', url_for('.edit_organisation_name', org_id=current_org.id), - suffix='organisation name' + suffix='organization name' ) }} {% endcall %} @@ -30,12 +30,12 @@ {{ edit_field( 'Change', url_for('.edit_organisation_type', org_id=current_org.id), - suffix='sector for the organisation' + suffix='sector for the organization' ) }} {% endcall %} {% call row() %} - {{ text_field('Crown organisation') }} + {{ text_field('Crown organization') }} {{ optional_text_field( { True: 'Yes', @@ -46,7 +46,7 @@ {{ edit_field( 'Change', url_for('.edit_organisation_crown_status', org_id=current_org.id), - suffix='organisation crown status' + suffix='organization crown status' ) }} {% endcall %} @@ -62,7 +62,7 @@ {{ edit_field( 'Change', url_for('.edit_organisation_agreement', org_id=current_org.id), - suffix='data sharing and financial agreement for the organisation' + suffix='data sharing and financial agreement for the organization' ) }} {% endcall %} @@ -72,7 +72,7 @@ {{ edit_field( 'Change', url_for('.edit_organisation_go_live_notes', org_id=current_org.id), - suffix='go live notes for the organisation' + suffix='go live notes for the organization' ) }} {% endcall %} @@ -83,7 +83,7 @@ {{ edit_field( 'Change', url_for('.edit_organisation_billing_details', org_id=current_org.id), - suffix='billing details for the organisation' + suffix='billing details for the organization' ) }} {% endcall %} @@ -94,7 +94,7 @@ {{ edit_field( 'Change', url_for('.edit_organisation_notes', org_id=current_org.id), - suffix='the notes for the organisation' + suffix='the notes for the organization' ) }} {% endcall %} @@ -105,7 +105,7 @@ {{ edit_field( 'Change', url_for('.edit_organisation_email_branding', org_id=current_org.id), - suffix='default email branding for the organisation' + suffix='default email branding for the organization' ) }} {% endcall %} @@ -115,7 +115,7 @@ {{ edit_field( 'Change', url_for('.edit_organisation_domains', org_id=current_org.id), - suffix='known email domains for the organisation' + suffix='known email domains for the organization' ) }} {% endcall %} diff --git a/app/templates/views/performance.html b/app/templates/views/performance.html index 81abeb449..4eaad99da 100644 --- a/app/templates/views/performance.html +++ b/app/templates/views/performance.html @@ -105,13 +105,13 @@

- Organisations using Notify + Organizations using Notify

There are
{{ count_of_live_services_and_organisations.organisations|format_thousands }}
- organisations + organizations
and @@ -123,10 +123,10 @@
{% call(item, row_number) list_table( organisations_using_notify, - caption='Organisations using Notify', + caption='Organizations using Notify', caption_visible=False, field_headings=[ - 'Organisation', 'Number of live services' + 'Organization', 'Number of live services' ], empty_message='No data to show' ) %} diff --git a/app/templates/views/platform-admin/_base_template.html b/app/templates/views/platform-admin/_base_template.html index da1fb6542..04edbabcd 100644 --- a/app/templates/views/platform-admin/_base_template.html +++ b/app/templates/views/platform-admin/_base_template.html @@ -16,7 +16,7 @@ ('Summary', url_for('main.platform_admin')), ('Live services', url_for('main.live_services')), ('Trial mode services', url_for('main.trial_services')), - ('Organisations', url_for('main.organisations')), + ('Organizations', url_for('main.organisations')), ('Providers', url_for('main.view_providers')), ('Reports', url_for('main.platform_admin_reports')), ('Email branding', url_for('main.email_branding')), diff --git a/app/templates/views/pricing/billing-details.html b/app/templates/views/pricing/billing-details.html index 7ca3f8f21..4f1d0b155 100644 --- a/app/templates/views/pricing/billing-details.html +++ b/app/templates/views/pricing/billing-details.html @@ -12,7 +12,7 @@ {{ page_header('Billing details') }}

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

diff --git a/app/templates/views/register.html b/app/templates/views/register.html index 302f2fa37..6a75145a1 100644 --- a/app/templates/views/register.html +++ b/app/templates/views/register.html @@ -15,7 +15,7 @@ Create an account {{ form.name(param_extensions={"classes": "govuk-!-width-three-quarters"}) }} {{ form.email_address( param_extensions={ - "hint": {"text": "Must be from a public sector organisation"}, + "hint": {"text": "Must be from a public sector organization"}, "classes": "govuk-!-width-three-quarters", "autocomplete": "email" }, diff --git a/app/templates/views/service-settings.html b/app/templates/views/service-settings.html index 44f4a707b..af8c44b81 100644 --- a/app/templates/views/service-settings.html +++ b/app/templates/views/service-settings.html @@ -291,7 +291,7 @@

{% endif %} {% endcall %} - {{ edit_field('Change', url_for('.link_service_to_organisation', service_id=current_service.id), suffix='organisation for service') }} + {{ edit_field('Change', url_for('.link_service_to_organisation', service_id=current_service.id), suffix='organization for service') }} {% endcall %} {% call row() %} diff --git a/tests/app/main/views/organisations/test_organisations.py b/tests/app/main/views/organisations/test_organisations.py index 42d16e449..fbf835565 100644 --- a/tests/app/main/views/organisations/test_organisations.py +++ b/tests/app/main/views/organisations/test_organisations.py @@ -34,7 +34,7 @@ def test_organisation_page_shows_all_organisations( assert normalize_spaces( page.select_one('h1').text - ) == "Organisations" + ) == "Organizations" assert [ ( @@ -922,18 +922,18 @@ def test_organisation_settings_for_platform_admin( ): expected_rows = [ 'Label Value Action', - 'Name Test organisation Change organisation name', - 'Sector Federal government Change sector for the organisation', - 'Crown organisation Yes Change organisation crown status', + 'Name Test organisation Change organization name', + 'Sector Federal government Change sector for the organization', + 'Crown organization Yes Change organization crown status', ( 'Data sharing and financial agreement ' - 'Not signed Change data sharing and financial agreement for the organisation' + 'Not signed Change data sharing and financial agreement for the organization' ), - 'Request to go live notes None Change go live notes for the organisation', - 'Billing details None Change billing details for the organisation', - 'Notes None Change the notes for the organisation', - 'Default email branding GOV.UK Change default email branding for the organisation', - 'Known email domains None Change known email domains for the organisation', + 'Request to go live notes None Change go live notes for the organization', + 'Billing details None Change billing details for the organization', + 'Notes None Change the notes for the organization', + 'Default email branding GOV.UK Change default email branding for the organization', + 'Known email domains None Change known email domains for the organization', ] client_request.login(platform_admin_user) diff --git a/tests/app/main/views/service_settings/test_service_settings.py b/tests/app/main/views/service_settings/test_service_settings.py index 7eaaf3b38..514542c96 100644 --- a/tests/app/main/views/service_settings/test_service_settings.py +++ b/tests/app/main/views/service_settings/test_service_settings.py @@ -94,7 +94,7 @@ def mock_get_service_settings_page_common( 'Count in list of live services Yes Change if service is counted in list of live services', 'Billing details None Change billing details for service', 'Notes None Change the notes for the service', - 'Organization Test organisation Federal government Change organisation for service', + 'Organization Test organisation Federal government Change organization for service', 'Rate limit 3,000 per minute Change rate limit', 'Message limit 1,000 per day Change daily message limit', 'Free text message allowance 250,000 per year Change free text message allowance', @@ -155,7 +155,7 @@ def test_no_go_live_link_for_service_without_organisation( organisation = find_element_by_tag_and_partial_text(page, tag='td', string='Organization') assert normalize_spaces(organisation.find_next_siblings()[0].text) == 'Not set Federal government' - assert normalize_spaces(organisation.find_next_siblings()[1].text) == 'Change organisation for service' + assert normalize_spaces(organisation.find_next_siblings()[1].text) == 'Change organization for service' def test_organisation_name_links_to_org_dashboard( diff --git a/tests/app/main/views/test_performance.py b/tests/app/main/views/test_performance.py index 0ab3e17d1..a4bb53e35 100644 --- a/tests/app/main/views/test_performance.py +++ b/tests/app/main/views/test_performance.py @@ -154,11 +154,11 @@ def test_should_render_performance_page( '20 February 2021 99.25% ' 'Only showing the last 7 days ' '' - 'Organisations using Notify ' - 'There are 111 organisations and 9,999 services using Notify. ' - 'Organisations using Notify ' - 'Organisation Number of live services ' + 'Organizations using Notify ' + 'There are 111 organizations and 9,999 services using Notify. ' + 'Organizations using Notify ' + 'Organization Number of live services ' 'Department of Examples and Patterns 2 ' 'Department of One Service 1 ' - 'No organisation 1' + 'No organization 1' ) diff --git a/tests/app/main/views/test_platform_admin.py b/tests/app/main/views/test_platform_admin.py index e0179980c..5af536ed0 100644 --- a/tests/app/main/views/test_platform_admin.py +++ b/tests/app/main/views/test_platform_admin.py @@ -765,7 +765,7 @@ def test_get_live_services_report( ) report = response.get_data(as_text=True) assert report.strip() == ( - 'Service ID,Organisation,Organisation type,Service name,Consent to research,Main contact,Contact email,' + + 'Service ID,Organization,Organization type,Service name,Consent to research,Main contact,Contact email,' + 'Contact mobile,Live date,SMS volume intent,Email volume intent,SMS sent this year,' + 'Emails sent this year,Free sms allowance\r\n' +