darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-08-18 21:49:37 -04:00
Code Issues Packages Projects Releases Wiki Activity

Updating for US English

Browse Source 
Words found:
personalis*
customis*
organis*
colour
behaviour
This commit is contained in:
Tim Lowden
2022-12-20 09:44:33 -05:00
parent bb79b20723
commit f8daea1879
46 changed files with 85 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/main/forms.py
View File

@@ -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'}}
]

2
app/main/validators.py
View File

@@ -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):

2
app/main/views/add_service.py
View File

@@ -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

8
app/main/views/organisations.py
View File

@@ -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:

2
app/main/views/send.py
View File

@@ -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):

2
app/main/views/templates.py
View File

@@ -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'
)

2
app/templates/components/uk_components/back-link/README.md
View File

@@ -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.

2
app/templates/components/uk_components/button/README.md
View File

@@ -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.

2
app/templates/components/uk_components/checkboxes/README.md
View File

@@ -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.

2
app/templates/components/uk_components/details/README.md
View File

@@ -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.

2
app/templates/components/uk_components/error-message/README.md
View File

@@ -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.

2
app/templates/components/uk_components/fieldset/README.md
View File

@@ -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.

2
app/templates/components/uk_components/footer/README.md
View File

@@ -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.

2
app/templates/components/uk_components/header/README.md
View File

@@ -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.

2
app/templates/components/uk_components/hint/README.md
View File

@@ -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.

2
app/templates/components/uk_components/input/README.md
View File

@@ -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.

2
app/templates/components/uk_components/inset-text/README.md
View File

@@ -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.

2
app/templates/components/uk_components/label/README.md
View File

@@ -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.

2
app/templates/components/uk_components/radios/README.md
View File

@@ -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.

2
app/templates/components/uk_components/skip-link/README.md
View File

@@ -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.

2
app/templates/components/uk_components/textarea/README.md
View File

@@ -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.

4
app/templates/partials/templates/guidance-personalisation.html
View File

@@ -1,10 +1,10 @@
{% from "components/uk_components/inset-text/macro.njk" import govukInsetText %}
<h2 class="heading-medium">
Personalisation
Personalization
</h2>
<p class="bottom-gutter-1-3">
Use double brackets to personalise your message:
Use double brackets to personalize your message:
</p>
{{ govukInsetText({
"text": "Hello ((first name)), your reference is ((ref number))",

2
app/templates/views/agreement/agreement-public.html
View File

@@ -18,7 +18,7 @@
<a class="govuk-link govuk-link--no-visited-state" href="{{ download_link }}">Download the agreement (PDF)</a>{% if owner %} for {{ owner }}{% endif %}.
</p>
<p class="govuk-body">
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.
</p>
</div>

8
app/templates/views/agreement/service-agreement-choose.html
View File

@@ -21,17 +21,17 @@
Before you can use U.S. Notify, you need to accept our data sharing and financial agreement.
</p>
<p class="govuk-body">
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.
</p>
<p class="govuk-body">
Once accepted, the agreement covers all Notify services from your organisation.
Once accepted, the agreement covers all Notify services from your organization.
</p>
<p class="govuk-body">
There are different agreements for crown and non-crown organisations.
There are different agreements for crown and non-crown organizations.
</p>
<p class="govuk-body">
<a class="govuk-link govuk-link--no-visited-state" href="{{ url_for('main.support') }}">Contact us</a> 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.
</p>

6
app/templates/views/agreement/service-agreement-signed.html
View File

@@ -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 @@
<div class="govuk-grid-row">
<div class="govuk-grid-column-five-sixths">
{{ page_header('Your organisation has already accepted the agreement')}}
{{ page_header('Your organization has already accepted the agreement')}}
<p class="govuk-body">
{{ current_service.organisation.name }} has already accepted the US
Notify data sharing and financial agreement.
</p>
<p class="govuk-body">
The agreement is confidential and should not be shared outside your organisation.
The agreement is confidential and should not be shared outside your organization.
</p>
</div>

2
app/templates/views/agreement/service-agreement.html
View File

@@ -28,7 +28,7 @@
Once accepted, the agreement covers all Notify services from {{ current_service.organisation.name }}.
</p>
<p class="govuk-body">
The agreement is confidential and should not be shared outside your organisation.
The agreement is confidential and should not be shared outside your organization.
</p>
{{ govukButton({
"element": "a",

4
app/templates/views/features/emails.html
View File

@@ -17,13 +17,13 @@
<p class="govuk-body">Notify makes it easy to:</p>
<ul class="list list-bullet">
<li>create reusable email templates</li>
<li>personalise the content of your emails</li>
<li>personalize the content of your emails</li>
<li>send and schedule bulk messages</li>
</ul>
<p class="govuk-body">You can also <a class="govuk-link govuk-link--no-visited-state" href="{{ url_for('.documentation') }}">integrate with our API</a> to send emails automatically.</p>
<h3 class="heading heading-small" id="branding">Email branding</h3>
<p class="govuk-body">Add your organisation’s logo and brand colour to email templates.</p>
<p class="govuk-body">Add your organization’s logo and brand color to email templates.</p>
<p class="govuk-body">See <a class="govuk-link govuk-link--no-visited-state" href="{{ url_for('.branding_and_customisation', _anchor='email-branding') }}">how to change your email branding</a>.</p>
<h3 class="heading heading-small" id="send-files">Send files by email</h3>

4
app/templates/views/guidance/branding-and-customisation.html
View File

@@ -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 %}
<h1 class="heading-large">Branding and customisation</h1>
<h1 class="heading-large">Branding and customization</h1>
<p class="govuk-body">This page explains how to:</p>

4
app/templates/views/guidance/edit-and-format-messages.html
View File

@@ -50,9 +50,9 @@
<li>you can no longer control where the redirect goes</li>
</ul>
<h2 class="heading-medium" id="personalised-content">Personalise your content</h2>
<h2 class="heading-medium" id="personalised-content">Personalize your content</h2>
<p class="govuk-body">To personalise the content of your messages, add a placeholder to the template.</p>
<p class="govuk-body">To personalize the content of your messages, add a placeholder to the template.</p>
<p class="govuk-body">Placeholders are filled in with details, like a name or reference number, each time you send a message.</p>

2
app/templates/views/guidance/index.html
View File

@@ -16,7 +16,7 @@
<ul class="list list-bullet">
<li><a class="govuk-link govuk-link--no-visited-state" href="{{ url_for('.edit_and_format_messages') }}">edit and format messages</a></li>
<li><a class="govuk-link govuk-link--no-visited-state" href="{{ url_for('.branding_and_customisation') }}">add branding and customisation</a></li>
<li><a class="govuk-link govuk-link--no-visited-state" href="{{ url_for('.branding_and_customisation') }}">add branding and customization</a></li>
<li><a class="govuk-link govuk-link--no-visited-state" href="{{ url_for('.send_files_by_email') }}">send files by email</a></li>
</ul>

2
app/templates/views/organisations/index.html
View File

@@ -32,7 +32,7 @@
<div class="js-stick-at-bottom-when-scrolling">
{{ govukButton({
"element": "a",
"text": "New organisation",
"text": "New organization",
"href": url_for('main.add_organisation'),
"classes": "govuk-button--secondary"
}) }}

2
app/templates/views/organisations/organisation/billing.html
View File

@@ -15,7 +15,7 @@
{% if current_org.agreement_signed_at %}
<p class="govuk-body">
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 }}.
</p>
<p class="govuk-body">

2
app/templates/views/pricing/billing-details-signed-out.html
View File

@@ -20,7 +20,7 @@
</ul>
<p class="govuk-body">
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.
</p>
{% endblock %}

10
app/templates/views/pricing/how-to-pay.html
View File

@@ -22,7 +22,7 @@
</p>
<p class="govuk-body">
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:
</p>
<ul class="list list-bullet">
@@ -30,7 +30,7 @@
</ul>
<p class="govuk-body">
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.
</p>
<p class="govuk-body">
@@ -50,15 +50,15 @@
</h2>
<p class="govuk-body">
If your organisation’s total estimated spend is more than £500 per quarter (before <abbr title="Value Added Tax">VAT</abbr>), you need to raise a purchase order (PO).
If your organization’s total estimated spend is more than £500 per quarter (before <abbr title="Value Added Tax">VAT</abbr>), you need to raise a purchase order (PO).
</p>
<p class="govuk-body">
Your organisation should raise a single <abbr title="purchase order">PO</abbr> for the estimated cost of all its services. You can update the <abbr title="purchase order">PO</abbr> any time if your usage increases.
Your organization should raise a single <abbr title="purchase order">PO</abbr> for the estimated cost of all its services. You can update the <abbr title="purchase order">PO</abbr> any time if your usage increases.
</p>
<p class="govuk-body">
Your organisation may need to <a class="govuk-link govuk-link--no-visited-state" href="{{ url_for('main.billing_details') }}">add the Cabinet Office as a supplier</a> before you can raise a <abbr title="purchase order">PO</abbr>.
Your organization may need to <a class="govuk-link govuk-link--no-visited-state" href="{{ url_for('main.billing_details') }}">add the Cabinet Office as a supplier</a> before you can raise a <abbr title="purchase order">PO</abbr>.
</p> -->
{% endblock %}

2
app/templates/views/send-contact-list.html
View File

@@ -22,7 +22,7 @@
<div class="govuk-grid-column-five-sixths">
<p class="govuk-body">
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) }}.
</p>
<p class="govuk-body">
Emergency contact lists can only include email addresses or phone

4
app/templates/views/service-settings.html
View File

@@ -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 %}
<a class="govuk-link govuk-link--no-visited-state" href="{{ url_for('main.organisation_dashboard', org_id=current_service.organisation_id) }}">

2
app/templates/views/service-settings/branding/email-branding-govuk-org.html
View File

@@ -21,7 +21,7 @@
<p class="govuk-body">You can only use U.S. Notify branding if people go to U.S. Notify to access your service.</p>
<p class="govuk-body">
You cannot use U.S. Notify branding if your organisation is
You cannot use U.S. Notify branding if your organization is
<a class="govuk-link govuk-link--no-visited-state"
href="https://www.gov.uk/government/publications/govuk-proposition/govuk-proposition#organisations-independent-from-government">independent
from government</a>.

2
app/templates/views/service-settings/branding/email-branding-govuk.html
View File

@@ -30,7 +30,7 @@
<p class="govuk-body">You can only use U.S. Notify branding if people go to U.S. Notify to access your service.</p>
<p class="govuk-body">
You cannot use U.S. Notify branding if your organisation is
You cannot use U.S. Notify branding if your organization is
<a class="govuk-link govuk-link--no-visited-state"
href="https://www.gov.uk/government/publications/govuk-proposition/govuk-proposition#organisations-independent-from-government">independent
from government</a>.

4
app/templates/views/service-settings/link-service-to-organisation.html
View File

@@ -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 %}
<p class="hint"> No organisations </p>
<p class="hint"> No organizations </p>
{% endif %}
{% endcall %}
{% endblock %}

2
app/templates/views/signedout.html
View File

@@ -92,7 +92,7 @@
</p>
<img
src="{{ asset_url('images/product/03-spreadsheet.svg') }}"
alt="A screenshot of a spreadsheet with columns for email address, name and colour"
alt="A screenshot of a spreadsheet with columns for email address, name and color"
>
</div>
<div class="govuk-grid-column-one-half">

6
app/templates/views/templates/template.html
View File

@@ -13,10 +13,10 @@
{% if show_redaction_message %}
<div class="bottom-gutter">
{% 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?') %}
<ul class="list list-bullet">
<li>
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
</li>
<li>
You cannot undo this
@@ -75,7 +75,7 @@
<a class="govuk-link govuk-link--destructive" href="{{ url_for('.confirm_redact_template', service_id=current_service.id, template_id=template.id) }}">Hide personalisation after sending</a>
</span>
{% else %}
<p class="hint">Personalisation is hidden after sending</p>
<p class="hint">Personalization is hidden after sending</p>
{% endif %}
{% endif %}
</div>

2
app/templates/views/terms-of-use.html
View File

@@ -16,7 +16,7 @@
<h2 class="heading-medium" id="when-using-notify">When using Notify</h2>
<p class="govuk-body">You must:</p>
<ul class="list list-bullet">
<li>complete your organisation’s information assurance process (you do not need to include Notify or our delivery partners, we’ve already done that)</li>
<li>complete your organization’s information assurance process (you do not need to include Notify or our delivery partners, we’ve already done that)</li>
<li>tell us immediately if you have any security breaches</li>
<li>keep your API keys secure</li>
<li>get the right levels of consent (to send messages and to use data)</li>