dinislage/web2py
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed problem with internationalization of IS_DATE_IN_RANGE and IS_DATETIME_IN_RANGE errors, issue 569

Browse Source
This commit is contained in:
Massimo Di Pierro
2011-12-19 23:15:40 -06:00
parent 822be670fe
commit dcd129f590
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
VERSION
+1 -1
View File
@@ -1 +1 @@
Version 1.99.4 (2011-12-19 22:58:55) stable Version 1.99.4 (2011-12-19 23:15:35) stable
gluon/validators.py
+8 -8
View File
@@ -2216,19 +2216,19 @@ class IS_DATE_IN_RANGE(IS_DATE):
error_message = "enter date on or after %(min)s" error_message = "enter date on or after %(min)s"
else: else:
error_message = "enter date in range %(min)s %(max)s" 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, IS_DATE.__init__(self,
format = format, format = format,
error_message = error_message % d) error_message = translate(error_message) % extremes)
def __call__(self, value): def __call__(self, value):
(value, msg) = IS_DATE.__call__(self,value) (value, msg) = IS_DATE.__call__(self,value)
if msg is not None: if msg is not None:
return (value, msg) return (value, msg)
if self.minimum and self.minimum > value: 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: if self.maximum and value > self.maximum:
return (value, translate(self.error_message)) return (value, self.error_message)
return (value, None) 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" error_message = "enter date and time on or after %(min)s"
else: else:
error_message = "enter date and time in range %(min)s %(max)s" 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, IS_DATETIME.__init__(self,
format = format, format = format,
error_message = error_message % d) error_message = translate(error_message) % extremes)
def __call__(self, value): def __call__(self, value):
(value, msg) = IS_DATETIME.__call__(self, value) (value, msg) = IS_DATETIME.__call__(self, value)
if msg is not None: if msg is not None:
return (value, msg) return (value, msg)
if self.minimum and self.minimum > value: 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: if self.maximum and value > self.maximum:
return (value, translate(self.error_message)) return (value, self.error_message)
return (value, None) return (value, None)