Django

Code

Changeset 6787

Show
Ignore:
Timestamp:
12/01/07 10:58:52 (1 year ago)
Author:
adrian
Message:

Edited docs/serialization.txt changes from [6645]

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • django/trunk/django/template/defaultfilters.py

    r6752 r6787  
    697697def pluralize(value, arg=u's'): 
    698698    """ 
    699     Returns a plural suffix if the value is not 1. By default, 's' is used as 
     699    Returns a plural suffix if the value is not 1. By default, 's' is used as 
    700700    the suffix: 
    701701 

  • django/trunk/docs/serialization.txt

    r6645 r6787  
    136136    json_serializer.serialize(queryset, ensure_ascii=False, stream=response) 
    137137 
    138 Django ships with a copy of simplejson_ in the source. Be aware, that if 
    139 you're using that for serializing directly that not all Django output can be 
     138The Django source code includes the simplejson_ module. Be aware that if 
     139you're serializing using that module directly, not all Django output can be 
    140140passed unmodified to simplejson. In particular, `lazy translation objects`_ 
    141141need a `special encoder`_ written for them. Something like this will work:: 
    …… 
    152152.. _lazy translation objects: ../i18n/#lazy-translation 
    153153.. _special encoder: http://svn.red-bean.com/bob/simplejson/tags/simplejson-1.7/docs/index.html 
    154  
    155 Writing custom serializers 
    156 `````````````````````````` 
    157  
    158 XXX ...