{% if current_user.has_permissions('manage_service') %} - To remove these restrictions + To remove these restrictions, you can send us a request to go live. {% else %} Your service manager can ask to have these restrictions removed. diff --git a/app/templates/views/service-settings/branding/email-options.html b/app/templates/views/service-settings/branding/email-options.html index c0ea4ff81..d93bb660d 100644 --- a/app/templates/views/service-settings/branding/email-options.html +++ b/app/templates/views/service-settings/branding/email-options.html @@ -39,7 +39,7 @@
We’ll email you once your branding’s ready to use, or if we need any - more info. + more information.
{{ page_footer('Request new branding') }} {% endcall %} diff --git a/app/templates/views/service-settings/letter-contact/add.html b/app/templates/views/service-settings/letter-contact/add.html index 6f6e488c7..e284fa62d 100644 --- a/app/templates/views/service-settings/letter-contact/add.html +++ b/app/templates/views/service-settings/letter-contact/add.html @@ -20,7 +20,7 @@ {% call form_wrapper() %} {{ textbox( form.letter_contact_block, - label='This will appear as the ‘sender’ address on your letters.'|safe, + label='This will appear as the sender address on your letters.'|safe, hint='10 lines maximum', width='1-2', rows=10, diff --git a/app/templates/views/service-settings/letter-contact/edit.html b/app/templates/views/service-settings/letter-contact/edit.html index 8c17b67b6..4ca84f18a 100644 --- a/app/templates/views/service-settings/letter-contact/edit.html +++ b/app/templates/views/service-settings/letter-contact/edit.html @@ -18,7 +18,7 @@ {% call form_wrapper() %} {{ textbox( form.letter_contact_block, - label='This will appear as the ‘sender’ address on your letters.'|safe, + label='This will appear as the sender address on your letters.'|safe, hint='10 lines maximum', width='1-2', rows=10, @@ -28,7 +28,7 @@ {% if form.is_default.data %}- This is the default address for {{ current_service.name }} + This is currently your default address for {{ current_service.name }}.
{% else %}Users will see your service name:
- Contact support + Contact us if you want to use a different logo.
{% else %} diff --git a/app/templates/views/service-settings/set-inbound-sms.html b/app/templates/views/service-settings/set-inbound-sms.html index be36f4243..0cfab5267 100644 --- a/app/templates/views/service-settings/set-inbound-sms.html +++ b/app/templates/views/service-settings/set-inbound-sms.html @@ -33,10 +33,10 @@ 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 + We’ll create a special phone number for them to contact. You'll be able to see the messages on your dashboard, or get them using the API.
- It doesn’t cost you anything to receive messages. Users will pay their normal rate for + It does not cost you anything to receive text messages. Users will pay their normal rate for messaging a mobile number. {% endif %} diff --git a/app/templates/views/service-settings/sms-prefix.html b/app/templates/views/service-settings/sms-prefix.html index 65147907b..02b6daa04 100644 --- a/app/templates/views/service-settings/sms-prefix.html +++ b/app/templates/views/service-settings/sms-prefix.html @@ -5,13 +5,13 @@ {% from "components/form.html" import form_wrapper %} {% block service_page_title %} - Text messages start with service name + Start text messages with service name {% endblock %} {% block maincolumn_content %} {{ page_header( - 'Text messages start with service name', + 'Start text messages with service name', back_link=url_for('main.service_settings', service_id=current_service.id) ) }} diff --git a/app/templates/views/service-settings/sms-sender/edit.html b/app/templates/views/service-settings/sms-sender/edit.html index c8a249401..aad6a3538 100644 --- a/app/templates/views/service-settings/sms-sender/edit.html +++ b/app/templates/views/service-settings/sms-sender/edit.html @@ -31,7 +31,7 @@ {% endif %} {% if form.is_default.data %}- This is the default text message sender + This is the default text message sender.
{{ page_footer('Save') }} {% else %} diff --git a/tests/app/main/views/test_service_settings.py b/tests/app/main/views/test_service_settings.py index d983490ff..8f9b76d7b 100644 --- a/tests/app/main/views/test_service_settings.py +++ b/tests/app/main/views/test_service_settings.py @@ -71,7 +71,7 @@ def mock_get_service_settings_page_common( 'Label Value Action', 'Send text messages On Change', 'Text message sender GOVUK Change', - 'Text messages start with service name On Change', + 'Start text messages with service name On Change', 'International text messages Off Change', 'Receive text messages Off Change', @@ -93,7 +93,7 @@ def mock_get_service_settings_page_common( 'Label Value Action', 'Send text messages On Change', 'Text message sender GOVUK Change', - 'Text messages start with service name On Change', + 'Start text messages with service name On Change', 'International text messages Off Change', 'Receive text messages Off Change', @@ -207,7 +207,7 @@ def test_organisation_name_links_to_org_dashboard( 'Label Value Action', 'Send text messages On Change', 'Text message sender GOVUK Change', - 'Text messages start with service name On Change', + 'Start text messages with service name On Change', 'International text messages On Change', 'Receive text messages On Change', @@ -228,7 +228,7 @@ def test_organisation_name_links_to_org_dashboard( 'Label Value Action', 'Send text messages On Change', 'Text message sender GOVUK Change', - 'Text messages start with service name On Change', + 'Start text messages with service name On Change', 'International text messages Off Change', 'Receive text messages Off Change', @@ -341,7 +341,7 @@ def test_should_show_service_name( assert page.find('input', attrs={"type": "text"})['value'] == 'service one' assert page.select_one('main p').text == 'Users will see your service name:' assert normalize_spaces(page.select_one('main ul').text) == ( - 'at the start of every text message, eg ‘service one: This is an example message’ ' + 'at the start of every text message ' 'as your email sender name' ) app.service_api_client.get_service.assert_called_with(SERVICE_ONE_ID) @@ -400,7 +400,7 @@ def test_should_not_hit_api_if_service_name_hasnt_changed( @pytest.mark.parametrize('user, expected_text, expected_link', [ ( active_user_with_permissions, - 'To remove these restrictions request to go live.', + 'To remove these restrictions, you can send us a request to go live.', True, ), ( @@ -2594,7 +2594,7 @@ def test_edit_sms_sender( ( 'main.service_edit_letter_contact', get_default_letter_contact_block, - 'This is the default address for service one', + 'This is currently your default address for service one.', 'letter_contact_id', False ), @@ -2608,14 +2608,14 @@ def test_edit_sms_sender( ( 'main.service_edit_sms_sender', get_default_sms_sender, - 'This is the default text message sender', + 'This is the default text message sender.', 'sms_sender_id', False ), ( 'main.service_edit_sms_sender', get_non_default_sms_sender, - 'This is the default text message sender', + 'This is the default text message sender.', 'sms_sender_id', True )