From 34bfe4527d55de3fd02da995a954c43fa91f6ab5 Mon Sep 17 00:00:00 2001 From: Stefan Pochmann Date: Sat, 12 Oct 2013 21:22:11 +0200 Subject: [PATCH] consistency in error messages of number range validators --- gluon/validators.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/gluon/validators.py b/gluon/validators.py index 816a0656..53365332 100644 --- a/gluon/validators.py +++ b/gluon/validators.py @@ -718,8 +718,9 @@ class IS_INT_IN_RANGE(Validator): self.minimum = self.maximum = None if minimum is None: if maximum is None: - self.error_message = translate( - error_message or 'enter an integer') + if error_message is None: + error_message = 'enter an integer' + self.error_message = translate(error_message) else: self.maximum = int(maximum) if error_message is None: @@ -896,7 +897,7 @@ class IS_DECIMAL_IN_RANGE(Validator): >>> IS_DECIMAL_IN_RANGE(0,99)('12.34') (Decimal('12.34'), None) >>> IS_DECIMAL_IN_RANGE()('abc') - ('abc', 'enter a decimal number') + ('abc', 'enter a number') """ def __init__( @@ -911,7 +912,7 @@ class IS_DECIMAL_IN_RANGE(Validator): if minimum is None: if maximum is None: if error_message is None: - error_message = 'enter a decimal number' + error_message = 'enter a number' else: self.maximum = decimal.Decimal(str(maximum)) if error_message is None: