Ticket #12309: django-12309.diff

django/utils/dates.py

@@ -31 +31 @@
     1:_('Jan.'), 2:_('Feb.'), 3:_('March'), 4:_('April'), 5:_('May'), 6:_('June'), 7:_('July'),
     8:_('Aug.'), 9:_('Sept.'), 10:_('Oct.'), 11:_('Nov.'), 12:_('Dec.')
 }
+MONTHS_ALTERNATIVE = { # required by some locales
+    1:_('_January'), 2:_('_February'), 3:_('_March'), 4:_('_April'), 5:_('_May'), 6:_('_June'),
+    7:_('_July'), 8:_('_August'), 9:_('_September'), 10:_('_October'), 11:_('_November'),
+    12:_('_December')
+}
+ No newline at end of file

django/utils/dateformat.py

@@ -14 +14 @@
 import re
 import time
 import calendar
-from django.utils.dates import MONTHS, MONTHS_3, MONTHS_AP, WEEKDAYS, WEEKDAYS_ABBR
+from django.utils.dates import MONTHS, MONTHS_3, MONTHS_AP, WEEKDAYS, WEEKDAYS_ABBR, MONTHS_ALTERNATIVE
 from django.utils.tzinfo import LocalTimezone
 from django.utils.translation import ugettext as _
 from django.utils.encoding import force_unicode
 
-re_formatchars = re.compile(r'(?<!\\)([aAbBdDfFgGhHiIjlLmMnNOPrsStTUwWyYzZ])')
+re_formatchars = re.compile(r'(?<!\\)([aAbBdDEfFgGhHiIjlLmMnNOPrsStTUwWyYzZ])')
 re_escaped = re.compile(r'\\(.)')
 
 class Formatter(object):
@@ -126 +126 @@
         "Day of the week, textual, 3 letters; e.g. 'Fri'"
         return WEEKDAYS_ABBR[self.data.weekday()]
 
+    def E(self):
+        "Alternative month names as required by some locales"
+        return MONTHS_ALTERNATIVE[self.data.month]
+
     def F(self):
         "Month, textual, long; e.g. 'January'"
         return MONTHS[self.data.month]