diff --git a/app/main/forms.py b/app/main/forms.py index 0cbed0e20..d536076f3 100644 --- a/app/main/forms.py +++ b/app/main/forms.py @@ -1674,7 +1674,7 @@ class SupportRedirect(StripWhitespaceForm): who = GovukRadiosField( 'What do you need help with?', choices=[ - ('public-sector', 'I work in the public sector and need to send emails, text messages or letters'), + ('public-sector', 'I work in the public sector and need to send emails or text messages'), ('public', 'I’m a member of the public with a question for the government'), ], param_extensions={ diff --git a/app/main/views/sub_navigation_dictionaries.py b/app/main/views/sub_navigation_dictionaries.py index 7d42937be..a86ffcf1f 100644 --- a/app/main/views/sub_navigation_dictionaries.py +++ b/app/main/views/sub_navigation_dictionaries.py @@ -12,10 +12,10 @@ def features_nav(): "name": "Text messages", "link": "main.features_sms", }, - { - "name": "Letters", - "link": "main.features_letters", - }, + # { + # "name": "Letters", + # "link": "main.features_letters", + # }, ] }, { @@ -84,14 +84,14 @@ def using_notify_nav(): "name": "Send files by email", "link": "main.send_files_by_email", }, - { - "name": "Upload a letter", - "link": "main.upload_a_letter", - }, - { - "name": "Letter specification", - "link": "main.letter_specification", - }, + # { + # "name": "Upload a letter", + # "link": "main.upload_a_letter", + # }, + # { + # "name": "Letter specification", + # "link": "main.letter_specification", + # }, ] }, { diff --git a/app/templates/views/features.html b/app/templates/views/features.html index 7a8e0c9bd..0f3352f54 100644 --- a/app/templates/views/features.html +++ b/app/templates/views/features.html @@ -14,7 +14,7 @@

You do not need any technical knowledge to use Notify.

{% if not current_user.is_authenticated %} @@ -22,7 +22,7 @@ {% endif %}

Reusable message templates

-

To send an email, text or letter with Notify, you need to create a reusable message template first.

+

To send an email or text with Notify, you need to create a reusable message template first.

Templates let you send the same thing to lots of people, as often as you need to, without writing a new message each time.

Personalised content

@@ -53,10 +53,10 @@

Notify commits to:

-

We send messages through several different providers. If one provider fails, Notify switches to another so that your messages are not affected.

+

Visit our performance data page to see how Notify is performing.

diff --git a/app/templates/views/guidance/index.html b/app/templates/views/guidance/index.html index 8e5454f93..29af61c8b 100644 --- a/app/templates/views/guidance/index.html +++ b/app/templates/views/guidance/index.html @@ -10,7 +10,7 @@

Guidance

-

This guidance is for teams using US Notify to send emails, text messages and letters.

+

This guidance is for teams using US Notify to send emails and text messages.

It explains how to:

@@ -18,16 +18,16 @@
  • edit and format messages
  • add branding and customisation
  • send files by email
    • -
  • upload a letter
    • +

    More information

    -

    The US NotifyService Manual has advice on:

    +

    The US Notify Service Manual has advice on:

    diff --git a/app/templates/views/pricing/index.html b/app/templates/views/pricing/index.html index d0554095e..5669fcc13 100644 --- a/app/templates/views/pricing/index.html +++ b/app/templates/views/pricing/index.html @@ -22,10 +22,10 @@

    US Notify is free to use unless you:

    -

    You’ll only pay for the additional text messages or letters that you send. There’s no monthly charge, no setup fee and no procurement cost.

    +

    You’ll only pay for the additional text messages that you send. There’s no monthly charge, no setup fee and no procurement cost.

    {% if not current_user.is_authenticated %} @@ -229,7 +229,7 @@ "html": smsIntRates }) }} -

    Letters

    + -
    + {% endblock %} diff --git a/app/templates/views/privacy.html b/app/templates/views/privacy.html index 4aca97402..0948a126e 100644 --- a/app/templates/views/privacy.html +++ b/app/templates/views/privacy.html @@ -19,7 +19,7 @@

    Who we are

    -

    US Notify is a service that lets public service teams in the UK send emails, text messages, and letters +

    US Notify is a service that lets public service teams in the United States send text messages to users of their service.

    US Notify is provided by the Government Digital Service (GDS) which is part of the Cabinet Office.

    diff --git a/app/templates/views/signedout.html b/app/templates/views/signedout.html index b2cfdd06a..58b6ed73a 100644 --- a/app/templates/views/signedout.html +++ b/app/templates/views/signedout.html @@ -2,7 +2,7 @@ {% from "components/button/macro.njk" import govukButton %} {% block meta %} - + {% endblock %} {% block pageTitle %} @@ -26,7 +26,7 @@

    - Send emails, text messages and letters to your users + Send text messages and email to your users

    Try US Notify now if you work in federal, state or local government. @@ -115,16 +115,6 @@

    -
    -

    - Introducing US Notify -

    -
    -
    - -
    -
    -

    Who’s using US Notify

    @@ -147,7 +137,7 @@

    -
    +
    diff --git a/app/templates/views/trial-mode.html b/app/templates/views/trial-mode.html index 4fb808af6..51aa2328b 100644 --- a/app/templates/views/trial-mode.html +++ b/app/templates/views/trial-mode.html @@ -13,7 +13,7 @@
    • send 50 text messages and emails per day
    • send messages to yourself and other people in your team
      • -
    • create letter templates, but not send them
      • +
    {% if current_service and current_service.trial_mode %} diff --git a/tests/app/main/views/test_feedback.py b/tests/app/main/views/test_feedback.py index a7fd23ab9..33815abcc 100644 --- a/tests/app/main/views/test_feedback.py +++ b/tests/app/main/views/test_feedback.py @@ -51,7 +51,7 @@ def test_get_support_index_page_when_signed_out( assert normalize_spaces( page.select_one('form label[for=who-0]').text ) == ( - 'I work in the public sector and need to send emails, text messages or letters' + 'I work in the public sector and need to send emails or text messages' ) assert page.select_one('form input#who-0')['value'] == 'public-sector' assert normalize_spaces( diff --git a/tests/app/main/views/test_index.py b/tests/app/main/views/test_index.py index fce7c146a..71c5a78be 100644 --- a/tests/app/main/views/test_index.py +++ b/tests/app/main/views/test_index.py @@ -17,7 +17,7 @@ def test_non_logged_in_user_can_see_homepage( page = client_request.get('main.index', _test_page_title=False) assert page.h1.text.strip() == ( - 'Send emails, text messages and letters to your users' + 'Send text messages and email to your users' ) assert page.select_one('a[role=button][draggable=false]')['href'] == url_for( @@ -25,7 +25,7 @@ def test_non_logged_in_user_can_see_homepage( ) assert page.select_one('meta[name=description]')['content'].strip() == ( - 'US Notify lets you send emails, text messages and letters ' + 'US Notify lets you send text messages and email ' 'to your users. Try it now if you work in federal, state or local government.' ) @@ -360,6 +360,7 @@ def test_font_preload( @pytest.mark.parametrize('current_date, expected_rate', ( ('2022-05-01', '1.72'), )) +@pytest.mark.skip(reason="Currently hidden for TTS") def test_sms_price( client_request, mock_get_service_and_organisation_counts,