Changeset 3142

Timestamp:

06/18/06 20:09:00 (2 years ago)

Author:

mtredinnick

Message:

Fixed #1088 - Correctly detect when a float with too many digits before the
decimal point is passed in.

Files:

• django/trunk/django/core/validators.py (modified) (1 diff)

django/trunk/django/core/validators.py

@@ -356 +356 @@
-            raise ValidationError, ngettext("Please enter a valid decimal number with at most %s total digit.",
-                "Please enter a valid decimal number with at most %s total digits.", self.max_digits) % self.max_digits
+        if (not '.' in data and len(data) > (self.max_digits - self.decimal_places)) or ('.' in data and len(data) > (self.max_digits - (self.decimal_places - len(data.split('.')[1])) + 1)):
+            raise ValidationError, ngettext( "Please enter a valid decimal number with a whole part of at most %s digit.",
+                "Please enter a valid decimal number with a whole part of at most %s digits.", str(self.max_digits-self.decimal_places)) % str(self.max_digits-self.decimal_places)
-        if '.' in data and len(data.split('.')[1]) > self.decimal_places:
-            raise ValidationError, ngettext("Please enter a valid decimal number with at most %s decimal place.",