Ticket #5590: 5590.diff

django/core/serializers/json.py

@@ -9 +9 @@
 from django.core.serializers.python import Deserializer as PythonDeserializer
 from django.utils import datetime_safe
 from django.utils import simplejson
+from django.utils.functional import Promise
 
 try:
     import decimal
@@ -61 +62 @@
             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

@@ -39 +39 @@
         self.assertEqual(True, s == s2)
         s4 = ugettext_lazy('Some other string')
         self.assertEqual(False, s == s4)
+        
+        #it should be possible to serialize *_lazy objects.
+        from django.core.serializers import json
+        from django.utils import simplejson
+        serialized = simplejson.dumps(ugettext_lazy('Yet another string'), 
+            cls=json.DjangoJSONEncoder)
+        self.assertEqual('"Yet another string"', serialized)
 
     def test_string_concat(self):
         """