Ticket #4121: dateformat.py.2.diff

django/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.translation import gettext as _
+from django.utils.translation import get_date_formats, get_partial_date_formats, gettext as _
 from calendar import isleap, monthrange
 import re, time
 
-re_formatchars = re.compile(r'(?<!\\)([aAbBdDfFgGhHiIjlLmMnNOPrsStTUwWyYzZ])')
+re_formatchars = re.compile(r'(?<!\\)([aAbcBdDfFgGhHiIjkKlLmMnNOPrsStTUwWxXyYzZ])')
 re_escaped = re.compile(r'\\(.)')
 
 class Formatter(object):
@@ -101 +101 @@
         "Seconds; i.e. '00' to '59'"
         return '%02d' % self.data.second
 
+    def X(self):
+        "Time, appropriate time representation. e.g. '8:00'"
+        (date_format, datetime_format, time_format) = get_date_formats()
+        return format(self.data, time_format)     
+
 class DateFormat(TimeFormat):
     year_days = [None, 0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334]
 
@@ -115 +120 @@
         "Month, textual, 3 letters, lowercase; e.g. 'jan'"
         return MONTHS_3[self.data.month]
 
+    def c(self):
+        "Datetime, appropriate date and time representation.; e.g. '2007-04-23 05:00'"
+        (date_format, datetime_format, time_format) = get_date_formats()
+        return format(self.data, datetime_format)
+
     def d(self):
         "Day of the month, 2 digits with leading zeros; i.e. '01' to '31'"
         return '%02d' % self.data.day
@@ -138 +148 @@
         "Day of the month without leading zeros; i.e. '1' to '31'"
         return self.data.day
 
+    def k(self):
+        "Month day, appropriate month day representation. e.g. 'January 5'"
+        (year_month_format, month_day_format) = get_partial_date_formats()
+        return format(self.data, month_day_format)           
+
+    def K(self):
+        "Year month, appropriate year month representation. e.g. '2007 January'"
+        (year_month_format, month_day_format) = get_partial_date_formats()
+        return format(self.data, year_month_format)   
+
     def l(self):
         "Day of the week, textual, long; e.g. 'Friday'"
         return WEEKDAYS[self.data.weekday()]
@@ -230 +250 @@
                     week_number -= 1
         return week_number
 
+    def x(self):
+        "Date, appropriate date representation. e.g. '2007-04-23'"
+        (date_format, datetime_format, time_format) = get_date_formats()
+        return format(self.data, date_format)        
+
     def y(self):
         "Year, 2 digits; e.g. '99'"
         return str(self.data.year)[2:]