Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Edited docs/serialization.txt changes from [6645]

git-svn-id: http://code.djangoproject.com/svn/django/trunk@6787 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit a73588aa58156460b75fde0d083443028e5f100e 1 parent e7bc0f1
@adrianholovaty adrianholovaty authored
Showing with 3 additions and 8 deletions.
  1. +1 −1  django/template/defaultfilters.py
  2. +2 −7 docs/serialization.txt
View
2  django/template/defaultfilters.py
@@ -696,7 +696,7 @@ def filesizeformat(bytes):
def pluralize(value, arg=u's'):
"""
- Returns a plural suffix if the value is not 1. By default, 's' is used as
+ Returns a plural suffix if the value is not 1. By default, 's' is used as
the suffix:
* If value is 0, vote{{ value|pluralize }} displays "0 votes".
View
9 docs/serialization.txt
@@ -135,8 +135,8 @@ For example::
json_serializer = serializers.get_serializer("json")()
json_serializer.serialize(queryset, ensure_ascii=False, stream=response)
-Django ships with a copy of simplejson_ in the source. Be aware, that if
-you're using that for serializing directly that not all Django output can be
+The Django source code includes the simplejson_ module. Be aware that if
+you're serializing using that module directly, not all Django output can be
passed unmodified to simplejson. In particular, `lazy translation objects`_
need a `special encoder`_ written for them. Something like this will work::
@@ -151,8 +151,3 @@ need a `special encoder`_ written for them. Something like this will work::
.. _lazy translation objects: ../i18n/#lazy-translation
.. _special encoder: http://svn.red-bean.com/bob/simplejson/tags/simplejson-1.7/docs/index.html
-
-Writing custom serializers
-``````````````````````````
-
-XXX ...
Please sign in to comment.
Something went wrong with that request. Please try again.