Ticket #4313: unicode-dateformat.diff

utils/dateformat.py

@@ -13 +13 @@
 
 from django.utils.dates import MONTHS, MONTHS_3, MONTHS_AP, WEEKDAYS
 from django.utils.tzinfo import LocalTimezone
+from django.utils.encoding import smart_unicode
 from django.utils.translation import ugettext as _
 from calendar import isleap, monthrange
 import re, time
@@ -25 +26 @@
         pieces = []
         for i, piece in enumerate(re_formatchars.split(formatstr)):
             if i % 2:
-                pieces.append(str(getattr(self, piece)()))
+                pieces.append(smart_unicode(getattr(self, piece)()))
             elif piece:
                 pieces.append(re_escaped.sub(r'\1', piece))
         return u''.join(pieces)