diff --git a/app/main/forms.py b/app/main/forms.py index e09f9cc23..343deb062 100644 --- a/app/main/forms.py +++ b/app/main/forms.py @@ -331,13 +331,17 @@ class ServiceReplyToEmailFrom(Form): class ServiceSmsSender(Form): - sms_sender = StringField('', validators=[Length(max=11, - message="Text message sender can't be longer than 11 characters")]) + sms_sender = StringField( + 'Text message sender', + validators=[ + Length(max=11, message="Enter fewer than 11 characters") + ] + ) def validate_sms_sender(form, field): import re if field.data and not re.match('^[a-zA-Z0-9\s]+$', field.data): - raise ValidationError('Text message sender can only contain alpha-numeric characters') + raise ValidationError('Use letters and numbers only') class ServiceBrandingOrg(Form): diff --git a/app/templates/views/service-settings/set-sms-sender.html b/app/templates/views/service-settings/set-sms-sender.html index e9c39a374..fdd9b6416 100644 --- a/app/templates/views/service-settings/set-sms-sender.html +++ b/app/templates/views/service-settings/set-sms-sender.html @@ -10,12 +10,27 @@
-

Set text message sender name

+

Text message sender

+

+ This appears instead of a phone number when a user receives a + text message from your service. +

+ If you leave this blank: +

+
{{ textbox( form.sms_sender, width='1-1', - safe_error_message=True + hint='Up to 11 characters, letters, numbers and spaces only' ) }} {{ page_footer( 'Save', diff --git a/tests/app/main/test_validators.py b/tests/app/main/test_validators.py index 5ea1300ca..c1ffa12d7 100644 --- a/tests/app/main/test_validators.py +++ b/tests/app/main/test_validators.py @@ -137,8 +137,8 @@ def test_sms_sender_form_validation(app_, mock_get_user_by_email): form.sms_sender.data = 'morethanelevenchars' form.validate() - assert "Text message sender can't be longer than 11 characters" == form.errors['sms_sender'][0] + assert "Enter fewer than 11 characters" == form.errors['sms_sender'][0] form.sms_sender.data = '###########' form.validate() - assert 'Text message sender can only contain alpha-numeric characters' == form.errors['sms_sender'][0] + assert 'Use letters and numbers only' == form.errors['sms_sender'][0]