diff --git a/VERSION b/VERSION index 5b2f40a6..38d6565c 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 1.99.4 (2011-12-19 22:58:55) stable +Version 1.99.4 (2011-12-19 23:15:35) stable diff --git a/gluon/validators.py b/gluon/validators.py index b5709b9e..94b0fe54 100644 --- a/gluon/validators.py +++ b/gluon/validators.py @@ -2216,19 +2216,19 @@ class IS_DATE_IN_RANGE(IS_DATE): error_message = "enter date on or after %(min)s" else: error_message = "enter date in range %(min)s %(max)s" - d = dict(min=minimum, max=maximum) + extremes = dict(min=minimum, max=maximum) IS_DATE.__init__(self, format = format, - error_message = error_message % d) + error_message = translate(error_message) % extremes) def __call__(self, value): (value, msg) = IS_DATE.__call__(self,value) if msg is not None: return (value, msg) if self.minimum and self.minimum > value: - return (value, translate(self.error_message)) + return (value, self.error_message) if self.maximum and value > self.maximum: - return (value, translate(self.error_message)) + return (value, self.error_message) return (value, None) @@ -2266,19 +2266,19 @@ class IS_DATETIME_IN_RANGE(IS_DATETIME): error_message = "enter date and time on or after %(min)s" else: error_message = "enter date and time in range %(min)s %(max)s" - d = dict(min = minimum, max = maximum) + extremes = dict(min = minimum, max = maximum) IS_DATETIME.__init__(self, format = format, - error_message = error_message % d) + error_message = translate(error_message) % extremes) def __call__(self, value): (value, msg) = IS_DATETIME.__call__(self, value) if msg is not None: return (value, msg) if self.minimum and self.minimum > value: - return (value, translate(self.error_message)) + return (value, self.error_message) if self.maximum and value > self.maximum: - return (value, translate(self.error_message)) + return (value, self.error_message) return (value, None)