Merge branch 'master' into inbound_number_admin

app/config.py

@@ -86,6 +86,7 @@ class Config(object):
         r"cjsm\.net",
         r"cqc\.org\.uk",
         r"bl\.uk",
+        r"stfc\.ac\.uk",
     ]
 
     LOGO_UPLOAD_BUCKET_NAME = 'public-logos-local'

app/main/validators.py

@@ -36,7 +36,7 @@ class ValidGovEmail:
     def __call__(self, form, field):
         from flask import url_for
         message = (
-            'Enter a central government email address.'
+            'Enter a government email address.'
             ' If you think you should have access'
             ' <a href="{}">contact us</a>').format(url_for('main.support'))
         if not is_gov_user(field.data.lower()):

app/templates/views/register.html

@@ -13,7 +13,7 @@ Create an account
     <h1 class="heading-large">Create an account</h1>
     <form method="post" novalidate>
       {{ textbox(form.name, width='3-4') }}
-      {{ textbox(form.email_address, hint="Must be from a central government organisation", width='3-4', safe_error_message=True) }}
+      {{ textbox(form.email_address, hint="Must be from a government organisation", width='3-4', safe_error_message=True) }}
       {{ textbox(form.mobile_number, width='3-4', hint='We’ll send you a security code by text message') }}
       <input class="visually-hidden" aria-hidden="true" tabindex="-1" id="defeat-chrome-autocomplete">
       {{ textbox(form.password, hint="At least 8 characters", width='3-4') }}