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

Merge pull request #231 from GSA/stvnrlly-us-abbrev-branding

Browse Source 
US Notify → U.S. Notify
This commit is contained in:
Steven Reilly
2022-12-06 16:42:56 -05:00
committed by GitHub
parent 92da56fe63 b6bc02eb6b
commit 8ce813fbbf
62 changed files with 128 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/assets/error_pages/5xx.html
+1 -1
View File
@@ -4,7 +4,7 @@
<head>
<meta charset="utf-8" />
<title>
Sorry, there is a problem with the service – US Notify
Sorry, there is a problem with the service – U.S. Notify
</title>
<meta name="viewport" content="width=device-width, initial-scale=1, viewport-fit=cover">
<meta name="theme-color" content="#0b0c0c" />
app/assets/javascripts/analytics/analytics.js
+1 -1
View File
@@ -15,7 +15,7 @@
window.ga('set', 'anonymizeIp', config.anonymizeIp);
window.ga('set', 'allowAdFeatures', config.allowAdFeatures);
window.ga('set', 'transport', config.transport);
window.ga('set', 'title', 'US Notify');
window.ga('set', 'title', 'U.S. Notify');
};
app/main/views/add_service.py
+1 -1
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 US Notify. Today is ((day of week)) and my favourite colour is ((colour)).',
'Hi, I’m trying out U.S. Notify. Today is ((day of week)) and my favourite colour is ((colour)).',
service_id,
)
return example_sms_template
app/main/views/api_keys.py
+1 -1
View File
@@ -125,7 +125,7 @@ def revoke_api_key(service_id, key_id):
if request.method == 'GET':
flash([
"Are you sure you want to revoke ‘{}’?".format(key_name),
"You will not be able to use this API key to connect to US Notify."
"You will not be able to use this API key to connect to U.S. Notify."
], 'revoke this API key')
return render_template(
'views/api/keys.html',
app/main/views/feedback.py
+2 -2
View File
@@ -76,7 +76,7 @@ def triage(ticket_type=PROBLEM_TICKET_TYPE):
form=form,
page_title={
PROBLEM_TICKET_TYPE: 'Report a problem',
GENERAL_TICKET_TYPE: 'Contact US Notify support',
GENERAL_TICKET_TYPE: 'Contact U.S. Notify support',
}.get(ticket_type)
)
@@ -151,7 +151,7 @@ def feedback(ticket_type):
),
show_status_page_banner=(ticket_type == PROBLEM_TICKET_TYPE),
page_title={
GENERAL_TICKET_TYPE: 'Contact US Notify support',
GENERAL_TICKET_TYPE: 'Contact U.S. Notify support',
PROBLEM_TICKET_TYPE: 'Report a problem',
QUESTION_TICKET_TYPE: 'Ask a question or give feedback',
}.get(ticket_type),
app/main/views/index.py
+1 -1
View File
@@ -133,7 +133,7 @@ def email_template():
'\n'
'10. Three'
'\n\n'
'This is an example of an email sent using US Notify.'
'This is an example of an email sent using U.S. Notify.'
'\n\n'
'https://www.notifications.service.gov.uk'
)
app/main/views/send.py
+1 -1
View File
@@ -430,7 +430,7 @@ def send_one_off_step(service_id, template_id, step_index):
if db_template['template_type'] == 'email':
email_reply_to = get_email_reply_to_address_from_session()
elif db_template['template_type'] == 'sms':
sms_sender = get_sms_sender_from_session() # TODO: verify default sender is US Notify
sms_sender = get_sms_sender_from_session() # TODO: verify default sender is U.S. Notify
template_values = get_recipient_and_placeholders_from_session(db_template['template_type'])
app/s3_client/s3_mou_client.py
+1 -1
View File
@@ -7,7 +7,7 @@ from app.s3_client.s3_logo_client import get_s3_object
def get_mou(organisation_is_crown):
bucket = current_app.config['MOU_BUCKET_NAME']
filename = 'crown.pdf' if organisation_is_crown else 'non-crown.pdf'
attachment_filename = 'US Notify data sharing and financial agreement{}.pdf'.format(
attachment_filename = 'U.S. Notify data sharing and financial agreement{}.pdf'.format(
'' if organisation_is_crown else ' (non-crown)'
)
try:
app/static/error_pages/5xx.html
+1 -1
View File
@@ -4,7 +4,7 @@
<head>
<meta charset="utf-8" />
<title>
Sorry, there is a problem with the service – US Notify
Sorry, there is a problem with the service – U.S. Notify
</title>
<meta name="viewport" content="width=device-width, initial-scale=1, viewport-fit=cover">
<meta name="theme-color" content="#0b0c0c" />
app/static/javascripts/all.js
+1 -1
View File
@@ -9,7 +9,7 @@ var GOVUK=function(e){"use strict";var r="undefined"!=typeof globalThis?globalTh
"use strict";!function(t){var u=t.jQuery,a=t.GOVUK||{};function n(){var t=this,o="ShowHideContent",i='[data-target] > input[type="radio"]',a='[data-target] > input[type="checkbox"]';function r(){var t=u(this),a=d(t);a.length&&(t.attr("aria-controls",a.attr("id")),t.attr("aria-expanded","false"),a.attr("aria-hidden","true"))}function d(t){var a=(a=t.attr("aria-controls"))||t.closest("[data-target]").data("target");return u("#"+a)}function s(t,a){a.hasClass("js-hidden")&&(a.removeClass("js-hidden"),a.attr("aria-hidden","false"),t.attr("aria-controls")&&t.attr("aria-expanded","true"))}function c(t,a){(a=a||d(t)).hasClass("js-hidden")||(a.addClass("js-hidden"),a.attr("aria-hidden","true"),t.attr("aria-controls")&&t.attr("aria-expanded","false"))}function n(t,a){var n=i+'[name="'+t.attr("name")+'"][aria-controls]',e=t.closest("form");(e.length?e.find(n):u(n)).each(function(){c(u(this))}),t.is("[aria-controls]")&&s(t,a)}function e(t,a){(t.is(":checked")?s:c)(t,a)}function h(n,t,a,e){function i(){var t=u(this);e(t,d(t))}n=n||u(document.body);t=u(t);t.each(r),u.each(a,function(t,a){n.on("click."+o,a,i)}),t.is(":checked")&&t.filter(":checked").each(i)}t.showHideRadioToggledContent=function(t){var a;h(t,i,(a=[],u(i).map(function(){var t=u(this).attr("name");return-1===u.inArray(t,a)?(a.push(t),'input[type="radio"][name="'+u(this).attr("name")+'"]'):null})),n)},t.showHideCheckboxToggledContent=function(t){h(t,a,[a],e)},t.destroy=function(t){(t=t||u(document.body)).off("."+o)}}n.prototype.init=function(t){this.showHideRadioToggledContent(t),this.showHideCheckboxToggledContent(t)},a.ShowHideContent=n,t.GOVUK=a}(window);
"use strict";function _typeof(o){return(_typeof="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(o){return typeof o}:function(o){return o&&"function"==typeof Symbol&&o.constructor===Symbol&&o!==Symbol.prototype?"symbol":typeof o})(o)}!function(){window.GOVUK=window.GOVUK||{};var i={analytics:!1},r={_ga:"analytics",_gid:"analytics"};window.GOVUK.cookie=function(o,n,e){return void 0!==n?!1===n||null===n?window.GOVUK.setCookie(o,"",{days:-1}):(void 0===e&&(e={days:30}),window.GOVUK.setCookie(o,n,e)):window.GOVUK.getCookie(o)},window.GOVUK.getConsentCookie=function(){var o,n=window.GOVUK.cookie("cookies_policy");if(!n)return null;try{o=JSON.parse(n)}catch(o){return null}return o="object"!==_typeof(o)&&null!==o?JSON.parse(o):o},window.GOVUK.setConsentCookie=function(o){var n,e=(e=window.GOVUK.getConsentCookie())||JSON.parse(JSON.stringify(i));for(n in o)if(e[n]=o[n],!o[n])for(var t in r)r[t]===n&&(window.GOVUK.cookie(t,null),window.GOVUK.cookie(t)&&(document.cookie=t+"=;expires="+new Date+";domain="+window.location.hostname.replace(/^www\./,".")+";path=/"));window.GOVUK.setCookie("cookies_policy",JSON.stringify(e),{days:365})},window.GOVUK.checkConsentCookieCategory=function(o,n){if(!window.GOVUK.getConsentCookie()&&r[o])return!0;o=window.GOVUK.getConsentCookie();try{return o[n]}catch(o){return console.error(o),!1}},window.GOVUK.checkConsentCookie=function(o,n){return"cookies_policy"===o||null===n||!1===n||!!r[o]&&window.GOVUK.checkConsentCookieCategory(o,r[o])},window.GOVUK.setCookie=function(o,n,e){window.GOVUK.checkConsentCookie(o,n)&&(o=o+"="+n+"; path=/",(e=void 0===e?{}:e).days&&((n=new Date).setTime(n.getTime()+24*e.days*60*60*1e3),o=o+"; expires="+n.toGMTString()),"https:"===document.location.protocol&&(o+="; Secure"),document.cookie=o)},window.GOVUK.getCookie=function(o){for(var n=o+"=",e=document.cookie.split(";"),t=0,i=e.length;t<i;t++){for(var r=e[t];" "===r.charAt(0);)r=r.substring(1,r.length);if(0===r.indexOf(n))return decodeURIComponent(r.substring(n.length))}return null}}(window);
"use strict";!function(t){t.GOVUK.hasConsentFor=function(n,o){return null!==(o=void 0===o?t.GOVUK.getConsentCookie():o)&&(n in o&&o[n])}}(window);
"use strict";function _typeof(e){return(_typeof="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e})(e)}!function(n){n.GOVUK=n.GOVUK||{};function e(e){n.ga("create",{trackingId:e.trackingId,cookieDomain:e.cookieDomain,cookieExpires:24*e.expires*60*60}),n.ga("set","anonymizeIp",e.anonymizeIp),n.ga("set","allowAdFeatures",e.allowAdFeatures),n.ga("set","transport",e.transport),n.ga("set","title","US Notify")}e.load=function(){var e,t,o,a;e=n,a=document,t="script",o="ga",e.GoogleAnalyticsObject=o,e.ga=e.ga||function(){(e.ga.q=e.ga.q||[]).push(arguments)},e.ga.l=+new Date,o=a.createElement(t),a=a.getElementsByTagName(t)[0],o.async=1,o.src="//www.google-analytics.com/analytics.js",a.parentNode.insertBefore(o,a)},e.prototype.trackPageview=function(e,t,o){var a="".concat(n.location.pathname).concat(n.location.search).replace(/[a-f0-9]{8}-?[a-f0-9]{4}-?4[a-f0-9]{3}-?[89ab][a-f0-9]{3}-?[a-f0-9]{12}/g,"…");n.ga("send","pageview",a)},e.prototype.trackEvent=function(e,t,o){e={eventCategory:e,eventAction:t};(o=o||{}).label&&(e.eventLabel=o.label,delete o.label),"object"===_typeof(o)&&$.extend(e,o),n.ga("send","event",e)},n.GOVUK.Analytics=e}(window);
"use strict";function _typeof(e){return(_typeof="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e})(e)}!function(n){n.GOVUK=n.GOVUK||{};function e(e){n.ga("create",{trackingId:e.trackingId,cookieDomain:e.cookieDomain,cookieExpires:24*e.expires*60*60}),n.ga("set","anonymizeIp",e.anonymizeIp),n.ga("set","allowAdFeatures",e.allowAdFeatures),n.ga("set","transport",e.transport),n.ga("set","title","U.S. Notify")}e.load=function(){var e,t,o,a;e=n,a=document,t="script",o="ga",e.GoogleAnalyticsObject=o,e.ga=e.ga||function(){(e.ga.q=e.ga.q||[]).push(arguments)},e.ga.l=+new Date,o=a.createElement(t),a=a.getElementsByTagName(t)[0],o.async=1,o.src="//www.google-analytics.com/analytics.js",a.parentNode.insertBefore(o,a)},e.prototype.trackPageview=function(e,t,o){var a="".concat(n.location.pathname).concat(n.location.search).replace(/[a-f0-9]{8}-?[a-f0-9]{4}-?4[a-f0-9]{3}-?[89ab][a-f0-9]{3}-?[a-f0-9]{12}/g,"…");n.ga("send","pageview",a)},e.prototype.trackEvent=function(e,t,o){e={eventCategory:e,eventAction:t};(o=o||{}).label&&(e.eventLabel=o.label,delete o.label),"object"===_typeof(o)&&$.extend(e,o),n.ga("send","event",e)},n.GOVUK.Analytics=e}(window);
"use strict";!function(a){a.GOVUK=a.GOVUK||{};var n="UA-75215134-1";a["ga-disable-".concat(n)]=!0;a.GOVUK.initAnalytics=function(){"analytics"in a.GOVUK||(a["ga-disable-".concat(n)]=!1,a.GOVUK.Analytics.load(),a.GOVUK.analytics=new GOVUK.Analytics({trackingId:n,cookieDomain:"auto",anonymizeIp:!0,allowAdFeatures:!1,transport:"beacon",expires:365}),a.GOVUK.analytics.trackPageview())}}(window);
"use strict";window.GOVUK=window.GOVUK||{},window.GOVUK.Modules=window.GOVUK.Modules||{},function(e){function o(){}o.clearOldCookies=function(e){var o=["_ga","_gid"];if(window.GOVUK.cookie("seen_cookie_message")&&(document.cookie="seen_cookie_message=;expires="+(new Date).toGMTString()+";path=/"),null===e)for(var i,t=0;t<o.length;t++)window.GOVUK.cookie(o[t])&&(i=o[t]+"=;expires="+(new Date).toGMTString()+";domain="+window.location.hostname.replace(/^www\./,".")+";path=/",document.cookie=i)},o.prototype.start=function(e){this.$module=e[0],this.$module.hideCookieMessage=this.hideCookieMessage.bind(this),this.$module.showConfirmationMessage=this.showConfirmationMessage.bind(this),this.$module.setCookieConsent=this.setCookieConsent.bind(this),this.$module.cookieBanner=document.querySelector(".notify-cookie-banner"),this.$module.cookieBannerConfirmationMessage=this.$module.querySelector(".notify-cookie-banner__confirmation"),this.setupCookieMessage()},o.prototype.setupCookieMessage=function(){var e=this;this.$hideLink=this.$module.querySelector("button[data-hide-cookie-banner]"),this.$hideLink&&this.$hideLink.addEventListener("click",this.$module.hideCookieMessage),this.$acceptCookiesLink=this.$module.querySelector("button[data-accept-cookies=true]"),this.$acceptCookiesLink&&this.$acceptCookiesLink.addEventListener("click",function(){return e.$module.setCookieConsent(!0)}),this.$rejectCookiesLink=this.$module.querySelector("button[data-accept-cookies=false]"),this.$rejectCookiesLink&&this.$rejectCookiesLink.addEventListener("click",function(){return e.$module.setCookieConsent(!1)}),this.showCookieMessage()},o.prototype.showCookieMessage=function(){var e;this.isInCookiesPage()||(e=window.GOVUK.cookie("cookies_policy"),this.$module&&!e&&(this.$module.style.display="block"))},o.prototype.hideCookieMessage=function(e){this.$module&&(this.$module.style.display="none"),e.target&&e.preventDefault()},o.prototype.setCookieConsent=function(e){window.GOVUK.setConsentCookie({analytics:e}),this.$module.showConfirmationMessage(e),this.$module.cookieBannerConfirmationMessage.focus(),e&&window.GOVUK.initAnalytics()},o.prototype.showConfirmationMessage=function(e){e=e?"You’ve accepted analytics cookies.":"You told us not to use analytics cookies.";this.$cookieBannerMainContent=document.querySelector(".notify-cookie-banner__wrapper"),this.$cookieBannerConfirmationMessage=document.querySelector(".notify-cookie-banner__confirmation-message"),this.$cookieBannerConfirmationMessage.insertAdjacentText("afterbegin",e),this.$cookieBannerMainContent.style.display="none",this.$module.cookieBannerConfirmationMessage.style.display="block"},o.prototype.isInCookiesPage=function(){return"/cookies"===window.location.pathname},e.CookieBanner=o}(window.GOVUK.Modules);
"use strict";window.GOVUK=window.GOVUK||{},window.GOVUK.Modules=window.GOVUK.Modules||{},function(e){function n(){}n.prototype.start=function(e){this.$module=e[0],this.$module.submitSettingsForm=this.submitSettingsForm.bind(this),document.querySelector("form[data-module=cookie-settings]").addEventListener("submit",this.$module.submitSettingsForm),this.setInitialFormValues()},n.prototype.setInitialFormValues=function(){var e=window.GOVUK.getConsentCookie("consent");e&&((e.analytics?document.querySelector("input[name=cookies-analytics][value=on]"):document.querySelector("input[name=cookies-analytics][value=off]")).checked=!0)},n.prototype.submitSettingsForm=function(e){e.preventDefault();for(var t=e.target.querySelectorAll("input[name=cookies-analytics]"),o={},n=0;n<t.length;n++){var i=t[n];if(i.checked){i="on"===i.value;o.analytics=i;break}}return window.GOVUK.setConsentCookie(o),this.showConfirmationMessage(),window.GOVUK.hasConsentFor("analytics")&&window.GOVUK.initAnalytics(),!1},n.prototype.showConfirmationMessage=function(){var e=document.querySelector("div[data-cookie-confirmation]"),t=document.querySelector(".cookie-settings__prev-page"),o=n.prototype.getReferrerLink();document.body.scrollTop=document.documentElement.scrollTop=0,o&&o!==document.location.pathname?(t.href=o,t.style.display="block"):t.style.display="none",e.style.display="block"},n.prototype.getReferrerLink=function(){return!!document.referrer&&new URL(document.referrer).pathname},e.CookieSettings=n}(window.GOVUK.Modules);
app/templates/admin_template.html
+1 -1
View File
@@ -34,7 +34,7 @@
{% endblock %}
{% block pageTitle %}
{% block per_page_title %}{% endblock %} – US Notify
{% block per_page_title %}{% endblock %} – U.S. Notify
{% endblock %}
{% block bodyStart %}
app/templates/error/401.html
+1 -1
View File
@@ -4,6 +4,6 @@
<div class="govuk-grid-row">
<div class="govuk-grid-column-two-thirds">
<h1>You’re not authorised to see this page</h1>
<p class="govuk-body"><a class="govuk-link govuk-link--no-visited-state" href="{{ url_for('main.sign_in' )}}">Sign in</a> to US Notify and try again.</p>
<p class="govuk-body"><a class="govuk-link govuk-link--no-visited-state" href="{{ url_for('main.sign_in' )}}">Sign in</a> to U.S. Notify and try again.</p>
</div>
{% endblock %}
app/templates/error/500.html
+1 -1
View File
@@ -4,7 +4,7 @@
<div class="govuk-grid-row">
<div class="govuk-grid-column-two-thirds">
<h1 class="heading-large">
Sorry, there’s a problem with US Notify
Sorry, there’s a problem with U.S. Notify
</h1>
<p class="govuk-body">
Try again later.
app/templates/partials/jobs/status.html
+1 -1
View File
@@ -15,7 +15,7 @@
Notify cannot send these messages because you have reached your daily limit. You can only send {{ current_service.message_limit|format_thousands }} messages per day.
</p>
<p class="govuk-error-message govuk-!-margin-bottom-6">
Upload this spreadsheet again tomorrow or <a class="govuk-link" href="https://www.notifications.service.gov.uk/support">contact the US Notify team</a> to raise the limit.
Upload this spreadsheet again tomorrow or <a class="govuk-link" href="https://www.notifications.service.gov.uk/support">contact the U.S. Notify team</a> to raise the limit.
</p>
{% endif %}
</div>
app/templates/views/accessibility_statement.html
+5 -5
View File
@@ -19,7 +19,7 @@
) }}
<p class="govuk-body">
This accessibility statement applies to the US Notify domain. <!-- It does not apply to the <a class="govuk-link govuk-link--no-visited-state" href="https://docs.notifications.service.gov.uk">US Notify API documentation subdomain</a>.-->
This accessibility statement applies to the U.S. Notify domain. <!-- It does not apply to the <a class="govuk-link govuk-link--no-visited-state" href="https://docs.notifications.service.gov.uk">U.S. Notify API documentation subdomain</a>.-->
</p>
<p class="govuk-body">
@@ -66,7 +66,7 @@
<h2 class="heading-medium" id="feedback-and-contact-information">Feedback and contact information</h2>
<p class="govuk-body">
If you need any part of this service in a different format like large print, audio recording or braille, <a class="govuk-link govuk-link--no-visited-state" href="{{ url_for('main.support') }}">contact the US Notify team</a>.
If you need any part of this service in a different format like large print, audio recording or braille, <a class="govuk-link govuk-link--no-visited-state" href="{{ url_for('main.support') }}">contact the U.S. Notify team</a>.
</p>
<p class="govuk-body">
@@ -76,7 +76,7 @@
<h2 class="heading-medium" id="reporting-accessibility-problems">Reporting accessibility problems with this website</h2>
<p class="govuk-body">
We’re always looking to improve the accessibility of this website. If you find any problems not listed on this page or think we’re not meeting accessibility requirements, <a class="govuk-link govuk-link--no-visited-state" href="{{ url_for('main.support') }}">contact the US Notify team</a>.
We’re always looking to improve the accessibility of this website. If you find any problems not listed on this page or think we’re not meeting accessibility requirements, <a class="govuk-link govuk-link--no-visited-state" href="{{ url_for('main.support') }}">contact the U.S. Notify team</a>.
</p>
<h2 class="heading-medium" id="technical-information">Technical information about this website’s accessibility</h2>
@@ -88,7 +88,7 @@
</p>
<p class="govuk-body">
US Notify is partially compliant with the Web Content Accessibility Guidelines (WCAG) version 2.1 AA standard, due to the non-compliances listed below.
U.S. Notify is partially compliant with the Web Content Accessibility Guidelines (WCAG) version 2.1 AA standard, due to the non-compliances listed below.
</p>
<h2 class="heading-medium" id="non-accessible-content">Non-accessible content</h2>
@@ -195,6 +195,6 @@
</p>
<p class="govuk-body">
We decided which pages to test based on the most common tasks that US Notify users need to complete. We also tested a sample of pages with common user interface components.
We decided which pages to test based on the most common tasks that U.S. Notify users need to complete. We also tested a sample of pages with common user interface components.
</p> -->
{% endblock %}
app/templates/views/agreement/agreement-confirm.html
+2 -2
View File
@@ -24,11 +24,11 @@
{% if current_service.organisation.agreement_signed_on_behalf_of_name and current_service.organisation.agreement_signed_on_behalf_of_email_address %}
<p class="govuk-body">
I confirm that I have the legal authority to accept the US Notify data sharing and financial agreement (version {{ current_service.organisation.agreement_signed_version }}) on behalf of {{ current_service.organisation.agreement_signed_on_behalf_of_name }} ({{ current_service.organisation.agreement_signed_on_behalf_of_email_address }}) and that {{ current_service.organisation.name }} will be bound by it.
I confirm that I have the legal authority to accept the U.S. Notify data sharing and financial agreement (version {{ current_service.organisation.agreement_signed_version }}) on behalf of {{ current_service.organisation.agreement_signed_on_behalf_of_name }} ({{ current_service.organisation.agreement_signed_on_behalf_of_email_address }}) and that {{ current_service.organisation.name }} will be bound by it.
</p>
{% else %}
<p class="govuk-body">
I confirm that I have the legal authority to accept the US Notify data sharing and financial agreement (version {{ current_service.organisation.agreement_signed_version }}) and that {{ current_service.organisation.name }} will be bound by it.
I confirm that I have the legal authority to accept the U.S. Notify data sharing and financial agreement (version {{ current_service.organisation.agreement_signed_version }}) and that {{ current_service.organisation.name }} will be bound by it.
</p>
{% endif %}
app/templates/views/agreement/agreement-public.html
+2 -2
View File
@@ -2,7 +2,7 @@
{% from "components/sub-navigation.html" import sub_navigation %}
{% block per_page_title %}
Download the US Notify data sharing and financial agreement
Download the U.S. Notify data sharing and financial agreement
{% endblock %}
{% block maincolumn_content %}
@@ -11,7 +11,7 @@
<div class="govuk-grid-column-two-thirds">
<h1 class="heading-large">
Download the US Notify data sharing and financial agreement
Download the U.S. Notify data sharing and financial agreement
</h1>
<p class="govuk-body">
app/templates/views/agreement/service-agreement-choose.html
+1 -1
View File
@@ -18,7 +18,7 @@
{{ page_header('Accept the data sharing and financial agreement')}}
<p class="govuk-body">
Before you can use US Notify, you need to accept our data sharing and financial agreement.
Before you can use U.S. Notify, you need to accept our data sharing and financial agreement.
</p>
<p class="govuk-body">
This must be done by, or on behalf of, someone with the authority to sign contracts for your organisation.
app/templates/views/agreement/service-agreement.html
+1 -1
View File
@@ -19,7 +19,7 @@
{{ page_header('Accept our data sharing and financial agreement')}}
<p class="govuk-body">
Before you can use US Notify, you need to accept our data sharing and financial agreement.
Before you can use U.S. Notify, you need to accept our data sharing and financial agreement.
</p>
<p class="govuk-body">
This must be done by, or on behalf of, someone with the authority to sign contracts for {{ current_service.organisation.name }}.
app/templates/views/cookies.html
+2 -2
View File
@@ -21,7 +21,7 @@
<p class="summary">
Cookies are small files saved on your phone, tablet or computer when you visit a website.
</p>
<p class="govuk-body">We use cookies to make US Notify work and collect information about how you use our service.</p>
<p class="govuk-body">We use cookies to make U.S. Notify work and collect information about how you use our service.</p>
<h2 class="heading-medium" id="essential-cookies">Essential cookies</h2>
<p class="govuk-body">
@@ -73,7 +73,7 @@
Google Analytics stores anonymised information about:
</p>
<ul class="govuk-list govuk-list--bullet">
<li>how you got to US Notify</li>
<li>how you got to U.S. Notify</li>
<li>the pages you visit on Notify and how long you spend on them</li>
<li>any errors you see while using Notify</li>
</ul>
app/templates/views/documentation.html
+1 -1
View File
@@ -7,7 +7,7 @@
{% block content_column_content %}
<h1 class="heading-large">Documentation</h1>
<p class="govuk-body">This documentation is for developers who want to integrate the US Notify API with a web application or back office system.</p>
<p class="govuk-body">This documentation is for developers who want to integrate the U.S. Notify API with a web application or back office system.</p>
<h2 class="heading-medium" id="client-libraries">Client libraries</h2>
<p class="govuk-body">Links to documentation open in a new tab.</p>
<ul class="list list-bullet">
app/templates/views/features.html
+1 -1
View File
@@ -9,7 +9,7 @@
{% block content_column_content %}
<h1 class="heading-large">Features</h1>
<p class="govuk-body">If you work for the federal government, you can use US Notify to keep your users updated.</p>
<p class="govuk-body">If you work for the federal government, you can use U.S. Notify to keep your users updated.</p>
<p class="govuk-body">Notify makes it easy to create, customize, and send <a class="govuk-link govuk-link--no-visited-state" href="{{ url_for('main.features_sms') }}">text messages</a>.</p>
<!-- <ul class="list list-bullet">
<li><a class="govuk-link govuk-link--no-visited-state" href="{{ url_for('main.features_email') }}">emails</a></li>
app/templates/views/features/emails.html
+1 -1
View File
@@ -8,7 +8,7 @@
{% block content_column_content %}
<h1 class="heading heading-large">Emails</h1>
<p class="govuk-body">Send an unlimited number of emails for free with US Notify.</p>
<p class="govuk-body">Send an unlimited number of emails for free with U.S. Notify.</p>
{% if not current_user.is_authenticated %}
<p class="govuk-body"><a class="govuk-link govuk-link--no-visited-state" href="{{ url_for('main.register') }}">Create an account</a> and try Notify for yourself.</p>
{% endif %}
app/templates/views/features/letters.html
+1 -1
View File
@@ -8,7 +8,7 @@
{% block content_column_content %}
<h1 class="heading heading-large">Letters</h1>
<p class="govuk-body">US Notify will print, pack and post your letters for you.</p>
<p class="govuk-body">U.S. Notify will print, pack and post your letters for you.</p>
{% if not current_user.is_authenticated %}
<p class="govuk-body"><a class="govuk-link govuk-link--no-visited-state" href="{{ url_for('main.register') }}">Create an account</a> and try Notify for yourself.</p>
{% endif %}
app/templates/views/features/text-messages.html
+1 -1
View File
@@ -30,7 +30,7 @@
<h3 class="heading heading-small" id="sender">Show people who your texts are from</h3>
<p class="govuk-body">When you send a text message with Notify, the sender name tells people who it’s from.</p>
<p class="govuk-body">To change the text message sender from the default of ‘US Notify’:</p>
<p class="govuk-body">To change the text message sender from the default of ‘U.S. Notify’:</p>
<ol class="list list-number">
<li>Go to the <b class="govuk-!-font-weight-bold">Text message settings</b> section of the {{ service_link(current_service, 'main.service_settings', 'settings') }} page.</li>
app/templates/views/get-started.html
+1 -1
View File
@@ -13,7 +13,7 @@
<ol class="get-started-list">
<li class="get-started-list__item">
<h2 class="get-started-list__heading">Check if US Notify is right for you</h2>
<h2 class="get-started-list__heading">Check if U.S. Notify is right for you</h2>
<p class="govuk-body">Read about our <a class="govuk-link govuk-link--no-visited-state" href="{{ url_for('main.features') }}">features</a>, <a class="govuk-link govuk-link--no-visited-state" href="{{ url_for('.pricing') }}">pricing</a> and <a class="govuk-link govuk-link--no-visited-state" href="{{ url_for('main.roadmap') }}">roadmap</a>.</p>
</li>
app/templates/views/guidance/branding-and-customisation.html
+2 -2
View File
@@ -20,7 +20,7 @@
<h2 class="heading-medium" id="email-branding">Change your email branding</h2>
<p class="govuk-body">The default branding for email templates is the US Notifylogo.</p>
<p class="govuk-body">The default branding for email templates is the U.S. Notifylogo.</p>
<p class="govuk-body">To change your email branding:</p>
@@ -45,7 +45,7 @@
<p class="govuk-body">The text message sender tells your users who the message is from.</p>
<p class="govuk-body">To change the text message sender from the default of ‘US Notify’:</p>
<p class="govuk-body">To change the text message sender from the default of ‘U.S. Notify’:</p>
<ol class="list list-number">
<li>Go to the <b class="govuk-!-font-weight-bold">Text message settings</b> section of the {{ service_link(current_service, 'main.service_settings', 'settings') }} page.</li>
app/templates/views/guidance/index.html
+1 -1
View File
@@ -10,7 +10,7 @@
<h1 class="heading-large">Guidance</h1>
<p class="govuk-body">This guidance is for teams using US Notify to send emails and text messages.</p>
<p class="govuk-body">This guidance is for teams using U.S. Notify to send emails and text messages.</p>
<p class="govuk-body">It explains how to:</p>
app/templates/views/organisations/organisation/billing.html
+4 -4
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 US Notify data sharing
Your organisation 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">
@@ -24,15 +24,15 @@
</p>
{% elif current_org.agreement_signed %}
<p class="govuk-body">
{{ current_org.name}} has accepted the US Notify data sharing and financial agreement.
{{ current_org.name}} has accepted the U.S. Notify data sharing and financial agreement.
</p>
{% elif current_org.agreement_signed is false %}
<p class="govuk-body">
{{ current_org.name}} needs to accept the US Notify data sharing and financial agreement.
{{ current_org.name}} needs to accept the U.S. Notify data sharing and financial agreement.
</p>
{% elif current_org.agreement_signed is none %}
<p class="govuk-body">
{{ current_org.name}} has not accepted the US Notify data sharing and financial agreement, but we have some service-specific agreements in place.
{{ current_org.name}} has not accepted the U.S. Notify data sharing and financial agreement, but we have some service-specific agreements in place.
</p>
{% endif %}
</div>
app/templates/views/organisations/organisation/index.html
+1 -1
View File
@@ -107,7 +107,7 @@
<div class="keyline-block govuk-!-margin-top-2"></div>
{% if not services %}
<p class="govuk-body govuk-hint">
{{ current_org.name }} has no live services on US Notify
{{ current_org.name }} has no live services on U.S. Notify
</p>
<div class="keyline-block govuk-!-margin-top-2"></div>
{% else %}
app/templates/views/pricing/how-to-pay.html
+1 -1
View File
@@ -10,7 +10,7 @@
{{ page_header('How to pay') }}
<!-- <p class="govuk-body">
If you use US Notify to send text messages or letters, you may need to send us a <a class="govuk-link govuk-link--no-visited-state" href="#purchase-orders">purchase order</a>.
If you use U.S. Notify to send text messages or letters, you may need to send us a <a class="govuk-link govuk-link--no-visited-state" href="#purchase-orders">purchase order</a>.
</p>
<h2 class="heading-medium" id="invoices">
app/templates/views/pricing/index.html
+1 -1
View File
@@ -19,7 +19,7 @@
}
) }}
<p class="govuk-body">US Notify is free to use unless you:</p>
<p class="govuk-body">U.S. Notify is free to use unless you:</p>
<ul class="list list-bullet">
<li>exceed your <a class="govuk-link govuk-link--no-visited-state" href="#text-messages">free text message allowance</a></li>
<!-- <li>send <a class="govuk-link govuk-link--no-visited-state" href="#letters">letters</a></li> -->
app/templates/views/privacy.html
+6 -6
View File
@@ -19,14 +19,14 @@
<h2 class="heading-medium" id="who-we-are">Who we are</h2>
<p class="govuk-body">US Notify is a service that lets public service teams in the United States send text messages
<p class="govuk-body">U.S. Notify is a service that lets public service teams in the United States send text messages
to users of their service.</p>
<p class="govuk-body">US Notify is provided by the TTS Public Benefits Studio, which is part of the General Services Administration (GSA).</p>
<p class="govuk-body">U.S. Notify is provided by the TTS Public Benefits Studio, which is part of the General Services Administration (GSA).</p>
<h2 class="heading-medium" id="what-data-we-collect-from-you">What data we collect from you</h2>
<p class="govuk-body">The personal data we collect from public sector employees that create a US Notify account includes:</p>
<p class="govuk-body">The personal data we collect from public sector employees that create a U.S. Notify account includes:</p>
<ul class="list list-bullet">
<li>your name</li>
@@ -36,11 +36,11 @@
<h2 class="heading-medium" id="why-we-need-your-data">Why we need your data</h2>
<p class="govuk-body">We need your personal data to ensure that only legitimate users of US Notify can use it to send notifications.</p>
<p class="govuk-body">We need your personal data to ensure that only legitimate users of U.S. Notify can use it to send notifications.</p>
<h2 class="heading-medium" id="what-we-do-with-your-data">What we do with your data</h2>
<p class="govuk-body">We use your data to check that you are allowed to access US Notify and to record your activity when using it. We use third party suppliers to do this.</p>
<p class="govuk-body">We use your data to check that you are allowed to access U.S. Notify and to record your activity when using it. We use third party suppliers to do this.</p>
<p class="govuk-body">We will not:</p>
@@ -53,7 +53,7 @@
<h2 class="heading-medium" id="how-long-we-keep-your-data">How long we keep your data</h2>
<p class="govuk-body">We will retain your personal data for as long as you have a US Notify account.</p>
<p class="govuk-body">We will retain your personal data for as long as you have a U.S. Notify account.</p>
<h2 class="heading-medium" id="where-your-data-is-processed">Where your data is processed and stored</h2>
app/templates/views/security.html
+1 -1
View File
@@ -8,7 +8,7 @@
{% block content_column_content %}
<h1 class="heading-large">Security</h1>
<p class="govuk-body">US Notify is built for the needs of government services. It has processes in place to:</p>
<p class="govuk-body">U.S. Notify is built for the needs of government services. It has processes in place to:</p>
<ul class="list list-bullet">
<li>protect user data</li>
<li>keep systems secure</li>
app/templates/views/service-settings/branding/email-branding-govuk-org.html
+2 -2
View File
@@ -18,10 +18,10 @@
{{ page_header('Before you request new branding') }}
<p class="govuk-body">You can only use US Notifybranding if people go to US Notifyto access your service.</p>
<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 US Notifybranding if your organisation is
You cannot use U.S. Notify branding if your organisation 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>.
app/templates/views/service-settings/branding/email-branding-govuk.html
+2 -2
View File
@@ -27,10 +27,10 @@
<h2 class="heading-medium">Before you continue</h2>
<p class="govuk-body">You can only use US Notifybranding if people go to US Notifyto access your service.</p>
<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 US Notifybranding if your organisation is
You cannot use U.S. Notify branding if your organisation 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>.
app/templates/views/service-settings/set-email.html
+1 -1
View File
@@ -18,7 +18,7 @@
<div class="govuk-grid-column-five-sixths">
{{ page_header('Send emails') }}
<p class="govuk-body">
It’s free to send emails through US Notify.
It’s free to send emails through U.S. Notify.
</p>
{% call form_wrapper() %}
{{ form.enabled }}
app/templates/views/signedout.html
+9 -9
View File
@@ -2,11 +2,11 @@
{% from "components/button/macro.njk" import govukButton %}
{% block meta %}
<meta name="description" content="US Notify lets you send text messages and email to your users. Try it now if you work in federal, state or local government.">
<meta name="description" content="U.S. Notify lets you send text messages and email to your users. Try it now if you work in federal, state or local government.">
{% endblock %}
{% block pageTitle %}
US Notify
U.S. Notify
{% endblock %}
{% block content %}
@@ -19,7 +19,7 @@
<a class="govuk-link govuk-link--no-visited-state" href="https://www.gsa.gov/about-us/organization/federal-acquisition-service/technology-transformation-services/tts-solutions" itemprop="item"><span itemprop="name">TTS Solutions</span></a>
</li>
<li class="breadcrumbs__item breadcrumbs__item--active" itemprop="itemListElement" itemscope itemtype="http://schema.org/ListItem">
<a class="govuk-link govuk-link--no-visited-state" href="#main" itemprop="item"><span itemprop="name">US Notify</span></a>
<a class="govuk-link govuk-link--no-visited-state" href="#main" itemprop="item"><span itemprop="name">U.S. Notify</span></a>
</li>
</ol>
</nav>
@@ -29,7 +29,7 @@
Send text messages and email to your users
</h1>
<p class="govuk-body">
Try US Notify now if you work in federal, state or local government.
Try U.S. Notify now if you work in federal, state or local government.
</p>
<div class="button-container">
{{ govukButton({
@@ -83,7 +83,7 @@
<div class="govuk-grid-column-one-half">
<img
src="{{ asset_url('images/product/02-reporting.svg') }}"
alt="A screenshot of US Notify showing counts of emails and text messages sent"
alt="A screenshot of U.S. Notify showing counts of emails and text messages sent"
>
</div>
</div>
@@ -105,7 +105,7 @@
</div>
<div class="govuk-grid-column-one-half">
<p class="govuk-body">
Integrate the US Notify API with your web&nbsp;application or
Integrate the U.S. Notify API with your web&nbsp;application or
back office system.
</p>
<img
@@ -117,7 +117,7 @@
</div>
<div class="product-page-section">
<div class="with-keyline bottom-gutter-2" id="whos-using-notify">
<h2>Who’s using US Notify</h2>
<h2>Who’s using U.S. Notify</h2>
<div class="govuk-grid-row bottom-gutter">
<div class="govuk-grid-column-one-half">
<span class="govuk-visually-hidden">There are</span>
@@ -174,7 +174,7 @@
The team
</h2>
<p class="govuk-body">
US Notify is built and maintained by the Public Benefits Studio, within the General Services Administration's Technology Transformation Services.
U.S. Notify is built and maintained by the Public Benefits Studio, within the General Services Administration's Technology Transformation Services.
</p>
<p class="govuk-body">
<a class="govuk-link govuk-link--no-visited-state" href="{{ url_for('main.support') }}">Contact us</a> if you have a question or want
@@ -184,7 +184,7 @@
<div class="govuk-grid-column-one-half">
<img
src="{{ asset_url('images/product/team.jpg') }}"
alt="A photo of the US Notify team gathered around a big screen. One team member is pointing at a graph on the screen."
alt="A photo of the U.S. Notify team gathered around a big screen. One team member is pointing at a graph on the screen."
>
</div>
</div>
app/templates/views/support/form.html
+1 -1
View File
@@ -22,7 +22,7 @@
<div class="panel panel-border-wide">
<p class="govuk-body">
Check our <a class="govuk-link govuk-link--no-visited-state" href="https://status.notifications.service.gov.uk">system status</a>
page to see if there are any known issues with US Notify.
page to see if there are any known issues with U.S. Notify.
</p>
</div>
{% endif %}
app/templates/views/support/index.html
+1 -1
View File
@@ -14,7 +14,7 @@
<p class="govuk-body">You can expect a response within 1 business day.</p>
<!-- <p class="govuk-body">US Notify provides 24-hour online support.</p> -->
<!-- <p class="govuk-body">U.S. Notify provides 24-hour online support.</p> -->
<!-- {% call form_wrapper() %}
{% if current_user.is_authenticated %}
app/templates/views/support/public.html
+3 -3
View File
@@ -4,7 +4,7 @@
{% from "components/back-link/macro.njk" import govukBackLink %}
{% block per_page_title %}
The US Notify service is for people who work in the government
The U.S. Notify service is for people who work in the government
{% endblock %}
{% block backLink %}
@@ -16,14 +16,14 @@
<div class="govuk-grid-row">
<div class="govuk-grid-column-two-thirds">
{{ page_header('The US Notify service is for people who work in the government') }}
{{ page_header('The U.S. Notify service is for people who work in the government') }}
<p class="govuk-body">
We cannot give advice to the public. We do not have access to information about you held by government departments.
</p>
<p class="govuk-body">
There are other pages on US Notifywhere you can get help:
There are other pages on U.S. Notifywhere you can get help:
</p>
<h2 class="govuk-heading-m govuk-!-margin-bottom-1">
app/templates/views/support/triage.html
+2 -2
View File
@@ -48,11 +48,11 @@
you send the wrong message by accident
</li>
<li>
a team member uses US Notify to send an
a team member uses U.S. Notify to send an
inappropriate message
</li>
<li>
your system is telling the US Notify API to send the wrong
your system is telling the U.S. Notify API to send the wrong
message
</li>
</ul>
app/templates/views/templates/action_blocked.html
+1 -1
View File
@@ -21,7 +21,7 @@
</p>
<p class="govuk-body">
If you need to send {{ 999|message_count_label(notification_type, suffix='') }}
<a class="govuk-link govuk-link--no-visited-state" href="{{ url_for('.support') }}">get in touch with the US Notify team</a>.
<a class="govuk-link govuk-link--no-visited-state" href="{{ url_for('.support') }}">get in touch with the U.S. Notify team</a>.
</p>
</div>
app/templates/views/terms-of-use.html
+2 -2
View File
@@ -10,7 +10,7 @@
<h1 class="heading-large">Terms of use</h1>
<p class="govuk-body">
These terms apply to your service’s use of US&nbsp;Notify. You must be the service manager to accept them.
These terms apply to your service’s use of U.S.&nbsp;Notify. You must be the service manager to accept them.
</p>
<h2 class="heading-medium" id="when-using-notify">When using Notify</h2>
@@ -25,7 +25,7 @@
</ul>
<p class="govuk-body">If you do not keep to these terms, we might have to stop sending your messages.</p>
<p class="govuk-body"> US Notify will:</p>
<p class="govuk-body"> U.S. Notify will:</p>
<ul class="list list-bullet">
<li>send all the messages you pass to us, as long as they meet our guidelines</li>
<li>
app/templates/views/trial-mode.html
+1 -1
View File
@@ -8,7 +8,7 @@
<h1 class="heading-large">Trial mode</h1>
<p class="govuk-body">When you add a new service it will start in trial mode. This lets you try out US Notify, with a few restrictions.</p>
<p class="govuk-body">When you add a new service it will start in trial mode. This lets you try out U.S. Notify, with a few restrictions.</p>
<p class="govuk-body">While your service is in trial mode you can only:</p>
<ul class="list list-bullet">
<li>send 50 text messages and emails per day</li>
app/webauthn_server.py
+1 -1
View File
@@ -14,7 +14,7 @@ def init_app(app):
relying_party = PublicKeyCredentialRpEntity(
id=base_url.hostname,
name="US Notify",
name="U.S. Notify",
)
app.webauthn_server = Fido2Server(
docs/notify-pilot-info.md
+3 -3
View File
@@ -34,7 +34,7 @@ agency money.</td>
</tbody>
</table>
OUR FIRST BET: US Notify
OUR FIRST BET: U.S. Notify
<table>
<colgroup>
@@ -58,7 +58,7 @@ rates</p></td>
</tbody>
</table>
**US Notify** will be a federally-run shared service allowing staff to
**U.S. Notify** will be a federally-run shared service allowing staff to
send thousands of customized-to-the-user text messages per year at
little-to-no-cost. The easy interface requires no technical expertise to
use and the setup process takes only ten minutes.
@@ -94,6 +94,6 @@ To get involved, email us at [tts-benefits-studio@gsa.gov](mailto:tts-benefits-s
3. **Sign up to pilot Notify:** Already think this might be the tool
for you? We’re looking for benefit-administering partners to
co-design a pilot program to test US Notify for specific use cases.
co-design a pilot program to test U.S. Notify for specific use cases.
Early adopters will have wrap-around set-up support from the Studio
and an opportunity to shape the future of this product.
paas-failwhale/index.html
+1 -1
View File
@@ -4,7 +4,7 @@
<head>
<meta charset="utf-8" />
<title>
Sorry, the service is unavailable – US Notify
Sorry, the service is unavailable – U.S. Notify
</title>
<meta name="viewport" content="width=device-width, initial-scale=1, viewport-fit=cover">
<meta name="theme-color" content="#0b0c0c" />
tests/app/main/test_errorhandlers.py
+6 -6
View File
@@ -10,7 +10,7 @@ def test_bad_url_returns_page_not_found(client_request):
_expected_status=404,
)
assert page.h1.string.strip() == 'Page not found'
assert page.title.string.strip() == 'Page not found – US Notify'
assert page.title.string.strip() == 'Page not found – U.S. Notify'
def test_load_service_before_request_handles_404(client_request, mocker):
@@ -37,7 +37,7 @@ def test_malformed_token_returns_page_not_found(client_request, url):
assert page.h1.string.strip() == 'Page not found'
flash_banner = page.find('div', class_='banner-dangerous').string.strip()
assert flash_banner == "There’s something wrong with the link you’ve used."
assert page.title.string.strip() == 'Page not found – US Notify'
assert page.title.string.strip() == 'Page not found – U.S. Notify'
def test_csrf_returns_400(client_request, mocker):
@@ -51,8 +51,8 @@ def test_csrf_returns_400(client_request, mocker):
_test_page_title=False,
)
assert page.h1.string.strip() == 'Sorry, there’s a problem with US Notify'
assert page.title.string.strip() == 'Sorry, there’s a problem with the service – US Notify'
assert page.h1.string.strip() == 'Sorry, there’s a problem with U.S. Notify'
assert page.title.string.strip() == 'Sorry, there’s a problem with the service – U.S. Notify'
def test_csrf_redirects_to_sign_in_page_if_not_signed_in(client_request, mocker):
@@ -69,5 +69,5 @@ def test_csrf_redirects_to_sign_in_page_if_not_signed_in(client_request, mocker)
def test_405_returns_something_went_wrong_page(client_request, mocker):
page = client_request.post_url('/', _expected_status=405)
assert page.h1.string.strip() == 'Sorry, there’s a problem with US Notify'
assert page.title.string.strip() == 'Sorry, there’s a problem with the service – US Notify'
assert page.h1.string.strip() == 'Sorry, there’s a problem with U.S. Notify'
assert page.title.string.strip() == 'Sorry, there’s a problem with the service – U.S. Notify'
tests/app/main/views/organisations/test_organisations.py
+5 -5
View File
@@ -86,7 +86,7 @@ def test_view_organisation_shows_the_correct_organisation(
assert normalize_spaces(page.select_one('h1').text) == 'Usage'
assert normalize_spaces(page.select_one('.govuk-hint').text) == (
'Test 1 has no live services on US Notify'
'Test 1 has no live services on U.S. Notify'
)
assert not page.select('a[download]')
@@ -1661,7 +1661,7 @@ def test_organisation_billing_page_when_the_agreement_is_signed_by_a_known_perso
)
assert page.h1.string == 'Billing'
assert '2.5 of the US Notify data sharing and financial agreement on 20 February 2020' in normalize_spaces(
assert '2.5 of the U.S. Notify data sharing and financial agreement on 20 February 2020' in normalize_spaces(
page.text)
assert f'{expected_signatory} signed' in page.text
# assert page.select_one('main a')['href'] == url_for('.organisation_download_agreement', org_id=ORGANISATION_ID)
@@ -1683,7 +1683,7 @@ def test_organisation_billing_page_when_the_agreement_is_signed_by_an_unknown_pe
)
assert page.h1.string == 'Billing'
assert (f'{organisation_one["name"]} has accepted the US Notify data '
assert (f'{organisation_one["name"]} has accepted the U.S. Notify data '
'sharing and financial agreement.') in page.text
# assert page.select_one('main a')['href'] == url_for('.organisation_download_agreement', org_id=ORGANISATION_ID)
@@ -1716,11 +1716,11 @@ def test_organisation_billing_page_when_the_agreement_is_not_signed(
@pytest.mark.parametrize('crown, expected_status, expected_file_fetched, expected_file_served', (
# (
# True, 200, 'crown.pdf',
# 'US Notify data sharing and financial agreement.pdf',
# 'U.S. Notify data sharing and financial agreement.pdf',
# ),
# (
# False, 200, 'non-crown.pdf',
# 'US Notify data sharing and financial agreement (non-crown).pdf',
# 'U.S. Notify data sharing and financial agreement (non-crown).pdf',
# ),
(
None, 404, None,
tests/app/main/views/service_settings/test_service_settings.py
+2 -2
View File
@@ -3781,7 +3781,7 @@ def test_unknown_channel_404s(
),
(
'email',
'It’s free to send emails through US Notify.',
'It’s free to send emails through U.S. Notify.',
'Send emails',
[],
'False',
@@ -3790,7 +3790,7 @@ def test_unknown_channel_404s(
),
(
'email',
'It’s free to send emails through US Notify.',
'It’s free to send emails through U.S. Notify.',
'Send emails',
['email', 'sms', 'letter'],
'True',
tests/app/main/views/test_add_service.py
+1 -1
View File
@@ -141,7 +141,7 @@ def test_should_add_service_and_redirect_to_tour_when_no_services(
'Example text message template',
'sms',
(
"Hi, I’m trying out US Notify. Today is "
"Hi, I’m trying out U.S. Notify. Today is "
"((day of week)) and my favourite colour is ((colour))."
),
101,
tests/app/main/views/test_agreement.py
+4 -4
View File
@@ -116,11 +116,11 @@ def test_unknown_gps_and_trusts_are_redirected(
@pytest.mark.parametrize('crown, expected_status, expected_file_fetched, expected_file_served', (
# (
# True, 200, 'crown.pdf',
# 'US Notify data sharing and financial agreement.pdf',
# 'U.S. Notify data sharing and financial agreement.pdf',
# ),
# (
# False, 200, 'non-crown.pdf',
# 'US Notify data sharing and financial agreement (non-crown).pdf',
# 'U.S. Notify data sharing and financial agreement (non-crown).pdf',
# ),
(
None, 404, None,
@@ -401,12 +401,12 @@ def test_accept_agreement_page_persists(
@pytest.mark.parametrize('name, email, expected_paragraph', (
(None, None, (
'I confirm that I have the legal authority to accept the '
'US Notify data sharing and financial agreement (version '
'U.S. Notify data sharing and financial agreement (version '
'1.2) and that Test Organisation will be bound by it.'
)),
('Firstname Lastname', 'test@example.com', (
'I confirm that I have the legal authority to accept the '
'US Notify data sharing and financial agreement (version '
'U.S. Notify data sharing and financial agreement (version '
'1.2) on behalf of Firstname Lastname (test@example.com) and '
'that Test Organisation will be bound by it.'
)),
tests/app/main/views/test_api_integration.py
+1 -1
View File
@@ -329,7 +329,7 @@ def test_should_show_confirm_revoke_api_key(
)
assert normalize_spaces(page.select('.banner-dangerous')[0].text) == (
'Are you sure you want to revoke ‘some key name’? '
'You will not be able to use this API key to connect to US Notify. '
'You will not be able to use this API key to connect to U.S. Notify. '
'Yes, revoke this API key'
)
assert mock_get_api_keys.call_args_list == [
tests/app/main/views/test_conversation.py
+1 -1
View File
@@ -99,7 +99,7 @@ def test_view_conversation(
)
assert normalize_spaces(page.select_one('title').text) == (
'Received text message – service one – US Notify'
'Received text message – service one – U.S. Notify'
)
assert normalize_spaces(page.select_one('h1').text) == (
'07123 456789'
tests/app/main/views/test_feedback.py
+3 -3
View File
@@ -102,7 +102,7 @@ def test_get_support_as_someone_in_the_public_sector(
_follow_redirects=True,
)
assert normalize_spaces(page.select('h1')) == (
'Contact US Notify support'
'Contact U.S. Notify support'
)
assert page.select_one('form textarea[name=feedback]')
assert page.select_one('form input[name=name]')
@@ -120,7 +120,7 @@ def test_get_support_as_member_of_public(
_follow_redirects=True,
)
assert normalize_spaces(page.select('h1')) == (
'The US Notify service is for people who work in the government'
'The U.S. Notify service is for people who work in the government'
)
assert len(page.select('h2 a')) == 3
assert not page.select('form')
@@ -410,7 +410,7 @@ def test_redirects_to_triage(
@pytest.mark.parametrize('ticket_type, expected_h1', (
(PROBLEM_TICKET_TYPE, 'Report a problem'),
(GENERAL_TICKET_TYPE, 'Contact US Notify support'),
(GENERAL_TICKET_TYPE, 'Contact U.S. Notify support'),
))
def test_options_on_triage_page(
client_request,
tests/app/main/views/test_index.py
+3 -3
View File
@@ -24,12 +24,12 @@ def test_non_logged_in_user_can_see_homepage(
)
assert page.select_one('meta[name=description]')['content'].strip() == (
'US Notify lets you send text messages and email '
'U.S. Notify lets you send text messages and email '
'to your users. Try it now if you work in federal, state or local government.'
)
assert normalize_spaces(page.select_one('#whos-using-notify').text) == (
'Who’s using US Notify '
'Who’s using U.S. Notify '
'There are 111 organizations and 9,999 services using Notify. '
'See the list of services and organizations.'
)
@@ -220,7 +220,7 @@ def test_old_integration_testing_page(
def test_terms_page_has_correct_content(client_request):
terms_page = client_request.get('main.terms')
assert normalize_spaces(terms_page.select('main p')[0].text) == (
'These terms apply to your service’s use of US Notify. '
'These terms apply to your service’s use of U.S. Notify. '
'You must be the service manager to accept them.'
)
tests/app/main/views/test_jobs.py
+1 -1
View File
@@ -234,7 +234,7 @@ def test_should_show_job_with_sending_limit_exceeded_status(
"Notify cannot send these messages because you have reached your daily limit. You can only send 1,000 messages per day." # noqa
)
assert normalize_spaces(page.select('main p')[2].text) == (
"Upload this spreadsheet again tomorrow or contact the US Notify team to raise the limit."
"Upload this spreadsheet again tomorrow or contact the U.S. Notify team to raise the limit."
)
tests/app/main/views/test_template_folders.py
+16 -16
View File
@@ -49,7 +49,7 @@ def _folder(name, folder_id=None, parent=None, users_with_permission=None):
),
[
(
'Templates – service one – US Notify',
'Templates – service one – U.S. Notify',
'Templates',
[],
{},
@@ -111,7 +111,7 @@ def _folder(name, folder_id=None, parent=None, users_with_permission=None):
None,
),
(
'Templates – service one – US Notify',
'Templates – service one – U.S. Notify',
'Templates',
[],
{'template_type': 'all'},
@@ -169,7 +169,7 @@ def _folder(name, folder_id=None, parent=None, users_with_permission=None):
None,
),
(
'Templates – service one – US Notify',
'Templates – service one – U.S. Notify',
'Templates',
[],
{'template_type': 'sms'},
@@ -204,7 +204,7 @@ def _folder(name, folder_id=None, parent=None, users_with_permission=None):
None,
),
(
'folder_one – Templates – service one – US Notify',
'folder_one – Templates – service one – U.S. Notify',
'Templates folder_one',
[{'template_type': 'all'}],
{'template_folder_id': PARENT_FOLDER_ID},
@@ -236,7 +236,7 @@ def _folder(name, folder_id=None, parent=None, users_with_permission=None):
None,
),
(
'folder_one – Templates – service one – US Notify',
'folder_one – Templates – service one – U.S. Notify',
'Templates folder_one',
[{'template_type': 'sms'}],
{'template_type': 'sms', 'template_folder_id': PARENT_FOLDER_ID},
@@ -261,7 +261,7 @@ def _folder(name, folder_id=None, parent=None, users_with_permission=None):
None,
),
(
'folder_one – Templates – service one – US Notify',
'folder_one – Templates – service one – U.S. Notify',
'Templates folder_one',
[{'template_type': 'email'}],
{'template_type': 'email', 'template_folder_id': PARENT_FOLDER_ID},
@@ -272,7 +272,7 @@ def _folder(name, folder_id=None, parent=None, users_with_permission=None):
'There are no email templates in this folder',
),
(
'folder_one_one – folder_one – Templates – service one – US Notify',
'folder_one_one – folder_one – Templates – service one – U.S. Notify',
'Templates folder_one folder_one_one',
[
{'template_type': 'all'},
@@ -299,7 +299,7 @@ def _folder(name, folder_id=None, parent=None, users_with_permission=None):
None,
),
(
'folder_one_one_one – folder_one_one – folder_one – Templates – service one – US Notify',
'folder_one_one_one – folder_one_one – folder_one – Templates – service one – U.S. Notify',
'Templates folder_one folder_one_one folder_one_one_one',
[
{'template_type': 'all'},
@@ -320,7 +320,7 @@ def _folder(name, folder_id=None, parent=None, users_with_permission=None):
None,
),
(
'folder_one_one_one – folder_one_one – folder_one – Templates – service one – US Notify',
'folder_one_one_one – folder_one_one – folder_one – Templates – service one – U.S. Notify',
'Templates folder_one folder_one_one folder_one_one_one',
[
{'template_type': 'email'},
@@ -338,7 +338,7 @@ def _folder(name, folder_id=None, parent=None, users_with_permission=None):
'There are no email templates in this folder',
),
(
'folder_two – Templates – service one – US Notify',
'folder_two – Templates – service one – U.S. Notify',
'Templates folder_two',
[{'template_type': 'all'}],
{'template_folder_id': FOLDER_TWO_ID},
@@ -349,7 +349,7 @@ def _folder(name, folder_id=None, parent=None, users_with_permission=None):
'This folder is empty',
),
(
'folder_two – Templates – service one – US Notify',
'folder_two – Templates – service one – U.S. Notify',
'Templates folder_two',
[{'template_type': 'sms'}],
{'template_folder_id': FOLDER_TWO_ID, 'template_type': 'sms'},
@@ -360,7 +360,7 @@ def _folder(name, folder_id=None, parent=None, users_with_permission=None):
'This folder is empty',
),
(
'folder_two – Templates – service one – US Notify',
'folder_two – Templates – service one – U.S. Notify',
'Templates folder_two',
[{'template_type': 'all'}],
{'template_folder_id': FOLDER_TWO_ID, 'template_type': 'all'},
@@ -598,7 +598,7 @@ def test_get_manage_folder_page(
_test_page_title=False,
)
assert normalize_spaces(page.select_one('title').text) == (
'folder_two – Templates – service one – US Notify'
'folder_two – Templates – service one – U.S. Notify'
)
assert page.select_one('input[name=name]')['value'] == 'folder_two'
delete_link = page.find('a', string="Delete this folder")
@@ -633,7 +633,7 @@ def test_get_manage_folder_viewing_permissions_for_users(
_test_page_title=False,
)
assert normalize_spaces(page.select_one('title').text) == (
'folder_two – Templates – service one – US Notify'
'folder_two – Templates – service one – U.S. Notify'
)
form_labels = page.select('legend.govuk-fieldset__legend')
assert normalize_spaces(form_labels[0].text) == "Team members who can see this folder"
@@ -685,7 +685,7 @@ def test_get_manage_folder_viewing_permissions_for_users_not_visible_when_no_man
_test_page_title=False,
)
assert normalize_spaces(page.select_one('title').text) == (
'folder_two – Templates – service one – US Notify'
'folder_two – Templates – service one – U.S. Notify'
)
form_labels = page.select('legend[class=form-label]')
assert len(form_labels) == 0
@@ -719,7 +719,7 @@ def test_get_manage_folder_viewing_permissions_for_users_not_visible_for_service
_test_page_title=False,
)
assert normalize_spaces(page.select_one('title').text) == (
'folder_two – Templates – service one – US Notify'
'folder_two – Templates – service one – U.S. Notify'
)
form_labels = page.select('legend[class=form-label]')
assert len(form_labels) == 0
tests/app/main/views/test_templates.py
+2 -2
View File
@@ -555,7 +555,7 @@ def test_user_with_only_send_and_view_sees_letter_page(
'Review your message'
)
assert normalize_spaces(page.select_one('title').text) == (
'Two week reminder – Templates – service one – US Notify'
'Two week reminder – Templates – service one – U.S. Notify'
)
@@ -792,7 +792,7 @@ def test_should_be_able_to_view_a_template_with_links(
'Review your message'
)
assert normalize_spaces(page.select_one('title').text) == (
'Two week reminder – Templates – service one – US Notify'
'Two week reminder – Templates – service one – U.S. Notify'
)
assert [
tests/app/main/views/test_webauthn_credentials.py
+1 -1
View File
@@ -74,7 +74,7 @@ def test_begin_register_returns_encoded_options(
assert user_options['id'] == bytes(platform_admin_user['id'], 'utf-8')
relying_party_options = webauthn_options['rp']
assert relying_party_options['name'] == 'US Notify'
assert relying_party_options['name'] == 'U.S. Notify'
assert relying_party_options['id'] == 'webauthn.io'
tests/javascripts/analytics/analytics.test.js
+1 -1
View File
@@ -52,7 +52,7 @@ describe("Analytics", () => {
expect(setUpArguments[1]).toEqual(['set', 'anonymizeIp', true]);
expect(setUpArguments[2]).toEqual(['set', 'allowAdFeatures', false]);
expect(setUpArguments[3]).toEqual(['set', 'transport', 'beacon']);
expect(setUpArguments[4]).toEqual(['set', 'title', 'US Notify']);
expect(setUpArguments[4]).toEqual(['set', 'title', 'U.S. Notify']);
});