Ticket #5590: django-json-lazy.diff

django/core/serializers/json.py

@@ -5 +5 @@
 import datetime
 from django.utils import simplejson
 from django.utils.simplejson import decoder
+from django.utils.functional import Promise
 from django.core.serializers.python import Serializer as PythonSerializer
 from django.core.serializers.python import Deserializer as PythonDeserializer
 try:
@@ -57 +58 @@
             return o.strftime(self.TIME_FORMAT)
         elif isinstance(o, decimal.Decimal):
             return str(o)
+        elif isinstance(o, Promise): 
+            # The input is the result of a gettext_lazy() call.
+            return unicode(o).encode('utf-8', 'strict')
         else:
             return super(DjangoJSONEncoder, self).default(o)
 

tests/regressiontests/i18n/tests.py

@@ -30 +30 @@
 >>> s4 = ugettext_lazy('Some other string')
 >>> s == s4
 False
+
+>>> from django.core.serializers import json
+>>> from django.utils import simplejson
+>>> s5 = ugettext_lazy('Yet another string')
+>>> simplejson.dumps(s5, cls=json.DjangoJSONEncoder)
+'"Yet another string"'
+
 """