From fc6541650d456df9839bfd9d34c1e4c773ea53ef Mon Sep 17 00:00:00 2001 From: Karan Saini <37518297+qurbat@users.noreply.github.com> Date: Mon, 10 Feb 2020 09:20:19 +0530 Subject: [PATCH 1/3] Update validators.py #260 --- baseframe/forms/validators.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/baseframe/forms/validators.py b/baseframe/forms/validators.py index a48ed8fb..ee5a353d 100644 --- a/baseframe/forms/validators.py +++ b/baseframe/forms/validators.py @@ -310,8 +310,10 @@ class IsEmoji(object): Error message to raise in case of a validation error. """ + default_message = __(u'This is not a valid emoji.') + def __init__(self, message=None): - self.message = message or _(u"This is not a valid emoji.") + self.message = message or self.default_message def __call__(self, form, field): if field.data not in emoji.UNICODE_EMOJI: @@ -328,8 +330,10 @@ class IsPublicEmailDomain(object): Error message to raise in case of a validation error. """ + default_message = __(u'This domain is not a public email domain.') + def __init__(self, message=None, timeout=30): - self.message = message or _(u'This domain is not a public email domain.') + self.message = message or self.default_message self.timeout = timeout def __call__(self, form, field): From fe9c0bc16e4245eaaacf117ed12bf3cd894b3667 Mon Sep 17 00:00:00 2001 From: Karan Saini <37518297+qurbat@users.noreply.github.com> Date: Mon, 17 Feb 2020 08:45:46 +0530 Subject: [PATCH 2/3] Update validators.py --- baseframe/forms/validators.py | 27 +++++++++++++++++---------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/baseframe/forms/validators.py b/baseframe/forms/validators.py index ee5a353d..850ce35b 100644 --- a/baseframe/forms/validators.py +++ b/baseframe/forms/validators.py @@ -126,9 +126,11 @@ class AllowedIf(object): :param str message: Validation error message. Will be formatted with an optional ``{field}}`` label """ + default_message = __(u"This requires ‘{field}’ to be specified") + def __init__(self, fieldname, message=None): self.fieldname = fieldname - self.message = message or __(u"This requires ‘{field}’ to be specified") + self.message = message or self.default_message def __call__(self, form, field): if field.data: @@ -151,10 +153,12 @@ class OptionalIf(Optional): :param str message: Validation error message """ + default_message = __("This is required") + def __init__(self, fieldname, message=None): super(OptionalIf, self).__init__() self.fieldname = fieldname - self.message = message or __("This is required") + self.message = message or self.default_message def __call__(self, form, field): if not is_empty(form[self.fieldname].data): @@ -174,10 +178,12 @@ class RequiredIf(DataRequired): :param str message: Validation error message """ + default_message = __("This is required") + field_flags = set() def __init__(self, fieldname, message=None): - message = message or __("This is required") + message = message or self.default_message super(RequiredIf, self).__init__(message=message) self.fieldname = fieldname @@ -309,8 +315,7 @@ class IsEmoji(object): :param message: Error message to raise in case of a validation error. """ - - default_message = __(u'This is not a valid emoji.') + default_message = __(u"This is not a valid emoji.") def __init__(self, message=None): self.message = message or self.default_message @@ -331,7 +336,7 @@ class IsPublicEmailDomain(object): """ default_message = __(u'This domain is not a public email domain.') - + def __init__(self, message=None, timeout=30): self.message = message or self.default_message self.timeout = timeout @@ -353,8 +358,10 @@ class IsNotPublicEmailDomain(object): Error message to raise in case of a validation error. """ + default_message = __(u'This domain is a public email domain.') + def __init__(self, message=None, timeout=30): - self.message = message or _(u'This domain is a public email domain.') + self.message = message or self.default_message self.timeout = timeout def __call__(self, form, field): @@ -383,7 +390,7 @@ def __call__(self, form, field): if diagnosis.code == 0: return else: - raise StopValidation(self.message or _(diagnosis.message)) + raise StopValidation(self.message or __(diagnosis.message)) # Legacy name @@ -406,11 +413,11 @@ class ValidUrl(object): ) def __init__(self, message=None, message_urltext=None, invalid_urls=[]): - self.message = message or _( + self.message = message or __( u'The URL “{url}” is not valid or is currently inaccessible' ) self.invalid_urls = invalid_urls - self.message_urltext = message_urltext or _( + self.message_urltext = message_urltext or __( u'The URL “{url}” linked from “{text}” is not valid or is currently inaccessible' ) From d89806497a2f06785aa2b9b42636ec020a93cc28 Mon Sep 17 00:00:00 2001 From: Karan Saini <37518297+qurbat@users.noreply.github.com> Date: Thu, 20 Feb 2020 16:45:57 +0530 Subject: [PATCH 3/3] Update validators.py --- baseframe/forms/validators.py | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/baseframe/forms/validators.py b/baseframe/forms/validators.py index 850ce35b..f178393a 100644 --- a/baseframe/forms/validators.py +++ b/baseframe/forms/validators.py @@ -123,7 +123,7 @@ class AllowedIf(object): Validator that allows a value only if another field also has a value. :param str fieldname: Name of the other field - :param str message: Validation error message. Will be formatted with an optional ``{field}}`` label + :param str message: Validation error message. Will be formatted with an optional ``{field}`` label """ default_message = __(u"This requires ‘{field}’ to be specified") @@ -315,7 +315,7 @@ class IsEmoji(object): :param message: Error message to raise in case of a validation error. """ - default_message = __(u"This is not a valid emoji.") + default_message = __(u"This is not a valid emoji") def __init__(self, message=None): self.message = message or self.default_message @@ -335,7 +335,7 @@ class IsPublicEmailDomain(object): Error message to raise in case of a validation error. """ - default_message = __(u'This domain is not a public email domain.') + default_message = __(u'This domain is not a public email domain') def __init__(self, message=None, timeout=30): self.message = message or self.default_message @@ -358,7 +358,7 @@ class IsNotPublicEmailDomain(object): Error message to raise in case of a validation error. """ - default_message = __(u'This domain is a public email domain.') + default_message = __(u'This domain is a public email domain') def __init__(self, message=None, timeout=30): self.message = message or self.default_message @@ -390,7 +390,7 @@ def __call__(self, form, field): if diagnosis.code == 0: return else: - raise StopValidation(self.message or __(diagnosis.message)) + raise StopValidation(self.message or _(diagnosis.message)) # Legacy name @@ -412,14 +412,18 @@ class ValidUrl(object): "Mozilla/5.0 (X11; Linux x86_64; rv:66.0) Gecko/20100101 HasGeek/linkchecker" ) + default_message = __( + u'The URL “{url}” is not valid or is currently inaccessible' + ) + + default_message_urltext = __( + u'The URL “{url}” linked from “{text}” is not valid or is currently inaccessible' + ) + def __init__(self, message=None, message_urltext=None, invalid_urls=[]): - self.message = message or __( - u'The URL “{url}” is not valid or is currently inaccessible' - ) + self.message = message or self.default_message self.invalid_urls = invalid_urls - self.message_urltext = message_urltext or __( - u'The URL “{url}” linked from “{text}” is not valid or is currently inaccessible' - ) + self.message_urltext = message_urltext or self.default_message_urltext def check_url(self, invalid_urls, url, text=None): if six.PY2: