Author: adrian
Date: 2007-12-01 10:58:52 -0600 (Sat, 01 Dec 2007)
New Revision: 6787
Modified:
django/trunk/django/template/defaultfilters.py
django/trunk/docs/serialization.txt
Log:
Edited docs/serialization.txt changes from [6645]
Modified: django/trunk/django/template/defaultfilters.py
===================================================================
--- django/trunk/django/template/defaultfilters.py 2007-12-01 16:52:49 UTC
(rev 6786)
+++ django/trunk/django/template/defaultfilters.py 2007-12-01 16:58:52 UTC
(rev 6787)
@@ -696,7 +696,7 @@
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".
Modified: django/trunk/docs/serialization.txt
===================================================================
--- django/trunk/docs/serialization.txt 2007-12-01 16:52:49 UTC (rev 6786)
+++ django/trunk/docs/serialization.txt 2007-12-01 16:58:52 UTC (rev 6787)
@@ -135,8 +135,8 @@
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 @@
.. _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 ...
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"Django updates" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to [EMAIL PROTECTED]
For more options, visit this group at
http://groups.google.com/group/django-updates?hl=en
-~----------~----~----~----~------~----~------~--~---
