Replace can't with cannot

This commit is contained in:
karlchillmaid
2019-09-12 16:42:33 +01:00
committed by Chris Hill-Scott
parent 68c9147fec
commit a2455abda4

View File

@@ -120,7 +120,7 @@ def email_address(label='Email address', gov_user=True, required=True):
validators.append(ValidGovEmail()) validators.append(ValidGovEmail())
if required: if required:
validators.append(DataRequired(message='Cant be empty')) validators.append(DataRequired(message='Cannot be empty'))
return EmailField(label, validators, render_kw={'spellcheck': 'false'}) return EmailField(label, validators, render_kw={'spellcheck': 'false'})
@@ -144,26 +144,26 @@ class InternationalPhoneNumber(TelField):
def uk_mobile_number(label='Mobile number'): def uk_mobile_number(label='Mobile number'):
return UKMobileNumber(label, return UKMobileNumber(label,
validators=[DataRequired(message='Cant be empty')]) validators=[DataRequired(message='Cannot be empty')])
def international_phone_number(label='Mobile number'): def international_phone_number(label='Mobile number'):
return InternationalPhoneNumber( return InternationalPhoneNumber(
label, label,
validators=[DataRequired(message='Cant be empty')] validators=[DataRequired(message='Cannot be empty')]
) )
def password(label='Password'): def password(label='Password'):
return PasswordField(label, return PasswordField(label,
validators=[DataRequired(message='Cant be empty'), validators=[DataRequired(message='Cannot be empty'),
Length(8, 255, message='Must be at least 8 characters'), Length(8, 255, message='Must be at least 8 characters'),
Blacklist(message='Choose a password thats harder to guess')]) Blacklist(message='Choose a password thats harder to guess')])
class SMSCode(StringField): class SMSCode(StringField):
validators = [ validators = [
DataRequired(message='Cant be empty'), DataRequired(message='Cannot be empty'),
Regexp(regex=r'^\d+$', message='Numbers only'), Regexp(regex=r'^\d+$', message='Numbers only'),
Length(min=5, message='Not enough numbers'), Length(min=5, message='Not enough numbers'),
Length(max=5, message='Too many numbers'), Length(max=5, message='Too many numbers'),
@@ -386,7 +386,7 @@ class OnOffField(RadioField):
class LoginForm(StripWhitespaceForm): class LoginForm(StripWhitespaceForm):
email_address = EmailField('Email address', validators=[ email_address = EmailField('Email address', validators=[
Length(min=5, max=255), Length(min=5, max=255),
DataRequired(message='Cant be empty'), DataRequired(message='Cannot be empty'),
ValidEmail() ValidEmail()
]) ])
password = PasswordField('Password', validators=[ password = PasswordField('Password', validators=[
@@ -396,7 +396,7 @@ class LoginForm(StripWhitespaceForm):
class RegisterUserForm(StripWhitespaceForm): class RegisterUserForm(StripWhitespaceForm):
name = StringField('Full name', name = StringField('Full name',
validators=[DataRequired(message='Cant be empty')]) validators=[DataRequired(message='Cannot be empty')])
email_address = email_address() email_address = email_address()
mobile_number = international_phone_number() mobile_number = international_phone_number()
password = password() password = password()
@@ -422,7 +422,7 @@ class RegisterUserFromInviteForm(RegisterUserForm):
def validate_mobile_number(self, field): def validate_mobile_number(self, field):
if self.auth_type.data == 'sms_auth' and not field.data: if self.auth_type.data == 'sms_auth' and not field.data:
raise ValidationError('Cant be empty') raise ValidationError('Cannot be empty')
class RegisterUserFromOrgInviteForm(StripWhitespaceForm): class RegisterUserFromOrgInviteForm(StripWhitespaceForm):
@@ -434,10 +434,10 @@ class RegisterUserFromOrgInviteForm(StripWhitespaceForm):
name = StringField( name = StringField(
'Full name', 'Full name',
validators=[DataRequired(message='Cant be empty')] validators=[DataRequired(message='Cannot be empty')]
) )
mobile_number = InternationalPhoneNumber('Mobile number', validators=[DataRequired(message='Cant be empty')]) mobile_number = InternationalPhoneNumber('Mobile number', validators=[DataRequired(message='Cannot be empty')])
password = password() password = password()
organisation = HiddenField('organisation') organisation = HiddenField('organisation')
email_address = HiddenField('email_address') email_address = HiddenField('email_address')
@@ -499,7 +499,7 @@ class InviteUserForm(PermissionsForm):
def validate_email_address(self, field): def validate_email_address(self, field):
if field.data.lower() == self.invalid_email_address: if field.data.lower() == self.invalid_email_address:
raise ValidationError("You cant send an invitation to yourself") raise ValidationError("You cannot send an invitation to yourself")
class InviteOrgUserForm(StripWhitespaceForm): class InviteOrgUserForm(StripWhitespaceForm):
@@ -511,7 +511,7 @@ class InviteOrgUserForm(StripWhitespaceForm):
def validate_email_address(self, field): def validate_email_address(self, field):
if field.data.lower() == self.invalid_email_address: if field.data.lower() == self.invalid_email_address:
raise ValidationError("You cant send an invitation to yourself") raise ValidationError("You cannot send an invitation to yourself")
class TwoFactorForm(StripWhitespaceForm): class TwoFactorForm(StripWhitespaceForm):
@@ -547,7 +547,7 @@ class RenameServiceForm(StripWhitespaceForm):
name = StringField( name = StringField(
u'Service name', u'Service name',
validators=[ validators=[
DataRequired(message='Cant be empty') DataRequired(message='Cannot be empty')
]) ])
@@ -555,7 +555,7 @@ class RenameOrganisationForm(StripWhitespaceForm):
name = StringField( name = StringField(
u'Organisation name', u'Organisation name',
validators=[ validators=[
DataRequired(message='Cant be empty') DataRequired(message='Cannot be empty')
]) ])
@@ -586,7 +586,7 @@ class AddGPOrganisationForm(StripWhitespaceForm):
def validate_name(self, field): def validate_name(self, field):
if self.same_as_service_name.data is False: if self.same_as_service_name.data is False:
if not field.data: if not field.data:
raise ValidationError('Cant be empty') raise ValidationError('Cannot be empty')
else: else:
field.data = '' field.data = ''
@@ -617,7 +617,7 @@ class OrganisationCrownStatusForm(StripWhitespaceForm):
('unknown', 'Not sure'), ('unknown', 'Not sure'),
], ],
validators=[ validators=[
DataRequired(message='Cant be empty') DataRequired(message='Cannot be empty')
], ],
) )
@@ -633,7 +633,7 @@ class OrganisationAgreementSignedForm(StripWhitespaceForm):
('unknown', 'No (but we have some service-specific agreements in place)'), ('unknown', 'No (but we have some service-specific agreements in place)'),
], ],
validators=[ validators=[
DataRequired(message='Cant be empty') DataRequired(message='Cannot be empty')
], ],
) )
@@ -662,7 +662,7 @@ class CreateServiceForm(StripWhitespaceForm):
name = StringField( name = StringField(
"Whats your service called?", "Whats your service called?",
validators=[ validators=[
DataRequired(message='Cant be empty') DataRequired(message='Cannot be empty')
]) ])
organisation_type = OrganisationTypeField('Who runs this service?') organisation_type = OrganisationTypeField('Who runs this service?')
@@ -689,7 +689,7 @@ class FreeSMSAllowance(StripWhitespaceForm):
free_sms_allowance = IntegerField( free_sms_allowance = IntegerField(
'Numbers of text message fragments per year', 'Numbers of text message fragments per year',
validators=[ validators=[
DataRequired(message='Cant be empty') DataRequired(message='Cannot be empty')
] ]
) )
@@ -709,12 +709,12 @@ class ConfirmPasswordForm(StripWhitespaceForm):
class BaseTemplateForm(StripWhitespaceForm): class BaseTemplateForm(StripWhitespaceForm):
name = StringField( name = StringField(
u'Template name', u'Template name',
validators=[DataRequired(message="Cant be empty")]) validators=[DataRequired(message="Cannot be empty")])
template_content = TextAreaField( template_content = TextAreaField(
u'Message', u'Message',
validators=[ validators=[
DataRequired(message="Cant be empty"), DataRequired(message="Cannot be empty"),
NoCommasInPlaceHolders() NoCommasInPlaceHolders()
] ]
) )
@@ -737,18 +737,18 @@ class SMSTemplateForm(BaseTemplateForm):
class EmailTemplateForm(BaseTemplateForm): class EmailTemplateForm(BaseTemplateForm):
subject = TextAreaField( subject = TextAreaField(
u'Subject', u'Subject',
validators=[DataRequired(message="Cant be empty")]) validators=[DataRequired(message="Cannot be empty")])
class LetterTemplateForm(EmailTemplateForm): class LetterTemplateForm(EmailTemplateForm):
subject = TextAreaField( subject = TextAreaField(
u'Main heading', u'Main heading',
validators=[DataRequired(message="Cant be empty")]) validators=[DataRequired(message="Cannot be empty")])
template_content = TextAreaField( template_content = TextAreaField(
u'Body', u'Body',
validators=[ validators=[
DataRequired(message="Cant be empty"), DataRequired(message="Cannot be empty"),
NoCommasInPlaceHolders() NoCommasInPlaceHolders()
] ]
) )
@@ -874,7 +874,7 @@ class SupportType(StripWhitespaceForm):
class Feedback(StripWhitespaceForm): class Feedback(StripWhitespaceForm):
name = StringField('Name') name = StringField('Name')
email_address = email_address(label='Email address', gov_user=False, required=False) email_address = email_address(label='Email address', gov_user=False, required=False)
feedback = TextAreaField('Your message', validators=[DataRequired(message="Cant be empty")]) feedback = TextAreaField('Your message', validators=[DataRequired(message="Cannot be empty")])
class Problem(Feedback): class Problem(Feedback):
@@ -978,7 +978,7 @@ class ServiceSmsSenderForm(StripWhitespaceForm):
sms_sender = StringField( sms_sender = StringField(
'Text message sender', 'Text message sender',
validators=[ validators=[
DataRequired(message="Cant be empty"), DataRequired(message="Cannot be empty"),
Length(max=11, message="Enter 11 characters or fewer"), Length(max=11, message="Enter 11 characters or fewer"),
Length(min=4, message="Enter 4 characters or more"), Length(min=4, message="Enter 4 characters or more"),
LettersNumbersAndFullStopsOnly(), LettersNumbersAndFullStopsOnly(),
@@ -995,7 +995,7 @@ class ServiceEditInboundNumberForm(StripWhitespaceForm):
class ServiceLetterContactBlockForm(StripWhitespaceForm): class ServiceLetterContactBlockForm(StripWhitespaceForm):
letter_contact_block = TextAreaField( letter_contact_block = TextAreaField(
validators=[ validators=[
DataRequired(message="Cant be empty"), DataRequired(message="Cannot be empty"),
NoCommasInPlaceHolders() NoCommasInPlaceHolders()
] ]
) )
@@ -1245,12 +1245,12 @@ class CallbackForm(StripWhitespaceForm):
class ServiceReceiveMessagesCallbackForm(CallbackForm): class ServiceReceiveMessagesCallbackForm(CallbackForm):
url = StringField( url = StringField(
"URL", "URL",
validators=[DataRequired(message='Cant be empty'), validators=[DataRequired(message='Cannot be empty'),
Regexp(regex="^https.*", message='Must be a valid https URL')] Regexp(regex="^https.*", message='Must be a valid https URL')]
) )
bearer_token = PasswordFieldShowHasContent( bearer_token = PasswordFieldShowHasContent(
"Bearer token", "Bearer token",
validators=[DataRequired(message='Cant be empty'), validators=[DataRequired(message='Cannot be empty'),
Length(min=10, message='Must be at least 10 characters')] Length(min=10, message='Must be at least 10 characters')]
) )
@@ -1258,12 +1258,12 @@ class ServiceReceiveMessagesCallbackForm(CallbackForm):
class ServiceDeliveryStatusCallbackForm(CallbackForm): class ServiceDeliveryStatusCallbackForm(CallbackForm):
url = StringField( url = StringField(
"URL", "URL",
validators=[DataRequired(message='Cant be empty'), validators=[DataRequired(message='Cannot be empty'),
Regexp(regex="^https.*", message='Must be a valid https URL')] Regexp(regex="^https.*", message='Must be a valid https URL')]
) )
bearer_token = PasswordFieldShowHasContent( bearer_token = PasswordFieldShowHasContent(
"Bearer token", "Bearer token",
validators=[DataRequired(message='Cant be empty'), validators=[DataRequired(message='Cannot be empty'),
Length(min=10, message='Must be at least 10 characters')] Length(min=10, message='Must be at least 10 characters')]
) )
@@ -1313,7 +1313,7 @@ def get_placeholder_form_instance(
field = StringField(placeholder_name) field = StringField(placeholder_name)
else: else:
field = StringField(placeholder_name, validators=[ field = StringField(placeholder_name, validators=[
DataRequired(message='Cant be empty') DataRequired(message='Cannot be empty')
]) ])
PlaceholderForm.placeholder_value = field PlaceholderForm.placeholder_value = field
@@ -1456,7 +1456,7 @@ class ReturnedLettersForm(StripWhitespaceForm):
references = TextAreaField( references = TextAreaField(
u'Letter references', u'Letter references',
validators=[ validators=[
DataRequired(message="Cant be empty"), DataRequired(message="Cannot be empty"),
] ]
) )
@@ -1471,7 +1471,7 @@ class TemplateFolderForm(StripWhitespaceForm):
] ]
users_with_permission = MultiCheckboxField('Team members who can see this folder') users_with_permission = MultiCheckboxField('Team members who can see this folder')
name = StringField('Folder name', validators=[DataRequired(message='Cant be empty')]) name = StringField('Folder name', validators=[DataRequired(message='Cannot be empty')])
def required_for_ops(*operations): def required_for_ops(*operations):
@@ -1482,7 +1482,7 @@ def required_for_ops(*operations):
# super weird # super weird
raise validators.StopValidation('Must be empty') raise validators.StopValidation('Must be empty')
if form.op in operations and not any(field.raw_data): if form.op in operations and not any(field.raw_data):
raise validators.StopValidation('Cant be empty') raise validators.StopValidation('Cannot be empty')
return validate return validate
@@ -1647,7 +1647,7 @@ class AcceptAgreementForm(StripWhitespaceForm):
def __validate_if_nominating(self, field): def __validate_if_nominating(self, field):
if self.who.data == 'someone-else': if self.who.data == 'someone-else':
if not field.data: if not field.data:
raise ValidationError('Cant be empty') raise ValidationError('Cannot be empty')
else: else:
field.data = '' field.data = ''