From 5306285ce21d59742d67a447c9c1a1e4be6d86a4 Mon Sep 17 00:00:00 2001 From: Claude Paroz Date: Thu, 18 Apr 2013 20:38:07 +0200 Subject: [PATCH] Complemented documentation following commit be9ae693c Refs #17840. Thanks Carl Meyer for noticing the omission. --- docs/ref/forms/fields.txt | 9 +++++++++ docs/releases/1.6.txt | 7 +++++++ 2 files changed, 16 insertions(+) diff --git a/docs/ref/forms/fields.txt b/docs/ref/forms/fields.txt index c8b8044d26a..03898e60ea7 100644 --- a/docs/ref/forms/fields.txt +++ b/docs/ref/forms/fields.txt @@ -467,6 +467,10 @@ For each field, we describe the default widget used if you don't specify The ``max_value`` and ``min_value`` error messages may contain ``%(limit_value)s``, which will be substituted by the appropriate limit. + .. versionchanged:: 1.6 + Similarly, the ``max_digits``, ``max_decimal_places`` and + ``max_whole_digits`` error messages may contain ``%(max)s``. + Takes four optional arguments: .. attribute:: max_value @@ -1013,6 +1017,11 @@ objects (in the case of ``ModelMultipleChoiceField``) into the The empty and normalized values were changed to be consistently ``QuerySets`` instead of ``[]`` and ``QuerySet`` respectively. + .. versionchanged:: 1.6 + The ``invalid_choice`` message may contain ``%(value)s`` and the + ``invalid_pk_value`` message may contain ``%(pk)s``, which will be + substituted by the appropriate values. + Allows the selection of one or more model objects, suitable for representing a many-to-many relation. As with :class:`ModelChoiceField`, you can use ``label_from_instance`` to customize the object diff --git a/docs/releases/1.6.txt b/docs/releases/1.6.txt index 2f06756a1bf..3e15f5b7671 100644 --- a/docs/releases/1.6.txt +++ b/docs/releases/1.6.txt @@ -423,6 +423,13 @@ Miscellaneous ``type='email'``, ``type='url'`` or ``type='number'`` depending on their corresponding field type. +* Form field's :attr:`~django.forms.Field.error_messages` that contain a + placeholder should now always use a named placeholder (``"Value '%(value)s' is + too big"`` instead of ``"Value '%s' is too big"``). See the corresponding + field documentation for details about the names of the placeholders. The + changes in 1.6 particularly affect :class:`~django.forms.DecimalField` and + :class:`~django.forms.ModelMultipleChoiceField`. + Features deprecated in 1.6 ==========================