Ticket #7333: 7333-suggestion.diff

django/newforms/fields.py

@@ -216 +216 @@
         'max_value': _(u'Ensure this value is less than or equal to %s.'),
         'min_value': _(u'Ensure this value is greater than or equal to %s.'),
         'max_digits': _('Ensure that there are no more than %s digits in total.'),
-        'max_decimal_places': _('Ensure that there are no more than %s decimal places.'),
-        'max_whole_digits': _('Ensure that there are no more than %s digits before the decimal point.')
+        'decimal_places': _('Ensure that there are no more than %s decimal places.'),
+        'total_digits': _('Ensure that there are no more than %s digits before the decimal point.')
     }
 
     def __init__(self, max_value=None, min_value=None, max_digits=None, decimal_places=None, *args, **kwargs):
@@ -250 +250 @@
         if self.max_digits is not None and (digits + decimals) > self.max_digits:
             raise ValidationError(self.error_messages['max_digits'] % self.max_digits)
         if self.decimal_places is not None and decimals > self.decimal_places:
-            raise ValidationError(self.error_messages['max_decimal_places'] % self.decimal_places)
+            raise ValidationError(self.error_messages['decimal_places'] % self.decimal_places)
         if self.max_digits is not None and self.decimal_places is not None and digits > (self.max_digits - self.decimal_places):
-            raise ValidationError(self.error_messages['max_whole_digits'] % (self.max_digits - self.decimal_places))
+            raise ValidationError(self.error_messages['total_digits'] % (self.max_digits - self.decimal_places))
         return value
 
 DEFAULT_DATE_INPUT_FORMATS = (

tests/regressiontests/forms/error_messages.py

@@ -77 +77 @@
 >>> e['min_value'] = 'MIN VALUE IS %s'
 >>> e['max_value'] = 'MAX VALUE IS %s'
 >>> e['max_digits'] = 'MAX DIGITS IS %s'
->>> e['max_decimal_places'] = 'MAX DP IS %s'
->>> e['max_whole_digits'] = 'MAX DIGITS BEFORE DP IS %s'
+>>> e['decimal_places'] = 'MAX DP IS %s'
+>>> e['total_digits'] = 'MAX DIGITS BEFORE DP IS %s'
 >>> f = DecimalField(min_value=5, max_value=10, error_messages=e)
 >>> f2 = DecimalField(max_digits=4, decimal_places=2, error_messages=e)
 >>> f.clean('')

docs/newforms.txt

@@ -1295 +1295 @@
     * Validates that the given value is a decimal. Leading and trailing
       whitespace is ignored.
     * Error message keys: ``required``, ``invalid``, ``max_value``,
-      ``min_value``, ``max_digits``, ``max_decimal_places``,
-      ``max_whole_digits``
+      ``min_value``, ``max_digits``, ``decimal_places``, ``total_digits``
 
 Takes four optional arguments: ``max_value``, ``min_value``, ``max_digits``,
 and ``decimal_places``. The first two define the limits for the fields value.