From ba04daa64fadbe01e78932804118885ad5f47a66 Mon Sep 17 00:00:00 2001 From: karlchillmaid Date: Thu, 11 Jul 2019 15:45:47 +0100 Subject: [PATCH 1/9] Update 'contact us' --- app/templates/views/service-settings/set-auth-type.html | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/app/templates/views/service-settings/set-auth-type.html b/app/templates/views/service-settings/set-auth-type.html index 33b154da3..722f24bbe 100644 --- a/app/templates/views/service-settings/set-auth-type.html +++ b/app/templates/views/service-settings/set-auth-type.html @@ -34,8 +34,7 @@ Your team members sign in with a text message code.

- If signing in with a text message is a problem for your team, - please contact us. + Contact us if signing in with a text message is a problem for your team.

{% endif %} From 4400a24af1a32a009f6c09277cb72e86c156af6c Mon Sep 17 00:00:00 2001 From: karlchillmaid Date: Thu, 11 Jul 2019 15:50:04 +0100 Subject: [PATCH 2/9] Update 'Contact us' --- app/templates/views/service-settings/set-inbound-sms.html | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/app/templates/views/service-settings/set-inbound-sms.html b/app/templates/views/service-settings/set-inbound-sms.html index 80263370c..be36f4243 100644 --- a/app/templates/views/service-settings/set-inbound-sms.html +++ b/app/templates/views/service-settings/set-inbound-sms.html @@ -20,8 +20,7 @@ Your service can receive text messages sent to {{ current_service.inbound_number }}.

- If you want to switch this feature off, - get in touch with the GOV.UK Notify team. + Contact us if you want to switch this feature off.

{% if current_user.has_permissions('manage_api_keys') %}

@@ -31,8 +30,7 @@ {% endif %} {% else %}

- If you want to be able to receive text messages from your users, please - get in touch. + Contact us if you want to be able to receive text messages from your users.

We’ll create a special phone number for your users to contact. You'll be able to see From 318df17712c1e8aae5035d235585897aaddedbc5 Mon Sep 17 00:00:00 2001 From: karlchillmaid Date: Thu, 11 Jul 2019 15:52:06 +0100 Subject: [PATCH 3/9] Update 'contact us' --- .../views/service-settings/request-letter-branding.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/templates/views/service-settings/request-letter-branding.html b/app/templates/views/service-settings/request-letter-branding.html index 1b9b3d6b5..91f22be97 100644 --- a/app/templates/views/service-settings/request-letter-branding.html +++ b/app/templates/views/service-settings/request-letter-branding.html @@ -29,7 +29,7 @@ Your letters do not have a logo.

- Contact support + Contact us if you want to add your organisation’s logo.

{% endif %} From e90f9a2609396f618b68f8f6ca436e4a00ca9d0a Mon Sep 17 00:00:00 2001 From: karlchillmaid Date: Fri, 12 Jul 2019 10:02:11 +0100 Subject: [PATCH 4/9] Update 'contact us' --- app/templates/views/signedout.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/templates/views/signedout.html b/app/templates/views/signedout.html index a3de3624d..091f372eb 100644 --- a/app/templates/views/signedout.html +++ b/app/templates/views/signedout.html @@ -176,7 +176,7 @@ and is supported 24 hours a day, 7 days a week.

- Contact the team if you have a question or want + Contact us if you have a question or want to give feedback.

From 18142e8a92a8a51c7aba75819e337978ddafe778 Mon Sep 17 00:00:00 2001 From: karlchillmaid Date: Fri, 12 Jul 2019 10:06:57 +0100 Subject: [PATCH 5/9] Update 'contact us' content --- app/templates/views/features/emails.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/templates/views/features/emails.html b/app/templates/views/features/emails.html index 6ad2a78de..668457478 100644 --- a/app/templates/views/features/emails.html +++ b/app/templates/views/features/emails.html @@ -35,7 +35,7 @@
  • email attachments are often marked as spam
    • -

    Contact the team and ask us to turn this feature on for your service.

    +

    Contact us if you want to send files by email.

    Read our API documentation for more information.

    Add a reply-to address

    From f1c8768f6375a033398350dde1b91900e539c10d Mon Sep 17 00:00:00 2001 From: karlchillmaid Date: Fri, 12 Jul 2019 10:07:54 +0100 Subject: [PATCH 6/9] Update 'contact us' content --- app/templates/views/features/text-messages.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/templates/views/features/text-messages.html b/app/templates/views/features/text-messages.html index 15ed77790..0f05083f8 100644 --- a/app/templates/views/features/text-messages.html +++ b/app/templates/views/features/text-messages.html @@ -24,7 +24,7 @@

    Receive text messages

    Let people send messages to your service or reply to your texts.

    You can see and reply to the messages you receive, or set up your own automated processes to manage replies.

    -

    Contact the team to request a unique number for text message replies.

    +

    Contact us to request a unique number for text message replies.

    Show people who your texts are from

    When you send a text message with Notify, the sender name tells people who it's from.

    From e096ff18fca821f4d538bc86d4fa2754e4f97c5d Mon Sep 17 00:00:00 2001 From: karlchillmaid Date: Fri, 12 Jul 2019 10:09:58 +0100 Subject: [PATCH 7/9] Update 'contact us' content --- app/templates/views/roadmap.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/templates/views/roadmap.html b/app/templates/views/roadmap.html index 98d019602..14faefbc6 100644 --- a/app/templates/views/roadmap.html +++ b/app/templates/views/roadmap.html @@ -11,7 +11,7 @@

    The GOV.UK Notify roadmap shows the things we’re working on and when we hope to have them ready for you to use.

    Notify is in public beta. This means it’s fully operational and supported, but we’re regularly adding new features. The roadmap is a guide to what we have planned, but some things might change.

    -

    You can contact us for more detail about these features, or to suggest something else you’d like Notify to offer.

    +

    You can contact us if you have any questions about the roadmap or suggestions for new features.

    January to March 2019

    From a425fc75d39ef9d568d60f03a583c8dc7d11906a Mon Sep 17 00:00:00 2001 From: karlchillmaid Date: Fri, 12 Jul 2019 10:11:32 +0100 Subject: [PATCH 8/9] Update 'contact us' content --- app/templates/views/security.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/templates/views/security.html b/app/templates/views/security.html index 0af312df4..55cc98fd5 100644 --- a/app/templates/views/security.html +++ b/app/templates/views/security.html @@ -50,7 +50,7 @@
  • your email address and password
  • a text message code that Notify sends to your phone
    • -

    If receiving text messages at work is a problem for your team, contact us about using an email link instead.

    +

    If signing in with a text message is a problem for your team, contact us to find out about using an email link instead.

    Information risk management

    Our approach to information risk management follows National Cyber Security Centre (NCSC) guidance. It assesses:

    From 6cd69be66e361e9e5a0359eb23638fe2f2681282 Mon Sep 17 00:00:00 2001 From: Chris Hill-Scott Date: Fri, 12 Jul 2019 11:10:56 +0100 Subject: [PATCH 9/9] Fix tests --- tests/app/main/views/test_service_settings.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/app/main/views/test_service_settings.py b/tests/app/main/views/test_service_settings.py index 87d56542a..cd6046ec4 100644 --- a/tests/app/main/views/test_service_settings.py +++ b/tests/app/main/views/test_service_settings.py @@ -4004,7 +4004,7 @@ def test_contact_link_is_not_displayed_without_the_upload_document_permission( 'main.service_set_inbound_sms', ['sms'], ( - 'If you want to be able to receive text messages from your users, please get in touch.' + 'Contact us if you want to be able to receive text messages from your users.' ) ), ( @@ -4085,12 +4085,12 @@ def test_set_inbound_sms_when_inbound_number_is_not_set( @pytest.mark.parametrize('user, expected_paragraphs', [ (active_user_with_permissions, [ 'Your service can receive text messages sent to 07700900123.', - 'If you want to switch this feature off, get in touch with the GOV.UK Notify team.', + 'Contact us if you want to switch this feature off.', 'You can set up callbacks for received text messages on the API integration page.', ]), (active_user_no_api_key_permission, [ 'Your service can receive text messages sent to 07700900123.', - 'If you want to switch this feature off, get in touch with the GOV.UK Notify team.', + 'Contact us if you want to switch this feature off.', ]), ]) def test_set_inbound_sms_when_inbound_number_is_set(