Changeset 3056

Timestamp:

06/01/06 23:26:07 (2 years ago)

Author:

adrian

Message:

Fixed #2063 -- Made admin date_hierarchy i18n-friendly by using the new YEAR_MONTH_FORMAT and MONTH_DAY_FORMAT technical message IDs. Thanks, ramiro

Files:

• django/trunk/django/contrib/admin/templatetags/admin_list.py (modified) (5 diffs)

django/trunk/django/contrib/admin/templatetags/admin_list.py

@@ -3 +3 @@
-from django.contrib.admin.views.main import MAX_SHOW_ALL_ALLOWED, ALL_VAR
-from django.contrib.admin.views.main import ORDER_VAR, ORDER_TYPE_VAR, PAGE_VAR, SEARCH_VAR
-, MONTHS
+
-from django.core.exceptions import ObjectDoesNotExist
-from django.db import models
@@ -9 +9 @@
-from django.utils.html import escape
-from django.utils.text import capfirst
-
+, get_partial_date_formats
-from django.template import Library
+import datetime
-
-register = Library()
@@ -194 +195 @@
-        month_lookup = cl.params.get(month_field)
-        day_lookup = cl.params.get(day_field)
+        year_month_format, month_day_format = get_partial_date_formats()
-
-        link = lambda d: cl.get_query_string(d, [field_generic])
-
-        if year_lookup and month_lookup and day_lookup:
-month_name = MONTHS[int(month_lookup)]
+day = datetime.date(int(year_lookup), int(month_lookup), int(day_lookup))
-            return {
-                'show': True,
-                'back': {
-                    'link': link({year_field: year_lookup, month_field: month_lookup}),
-"%s %s" % (month_name, year_lookup
+dateformat.format(day, year_month_format
-                },
-"%s %s" % (month_name, day_lookup
+dateformat.format(day, month_day_format
-            }
-        elif year_lookup and month_lookup:
@@ -217 +219 @@
-                'choices': [{
-                    'link': link({year_field: year_lookup, month_field: month_lookup, day_field: day.day}),
-y.strftime('%B %d'
+teformat.format(day, month_day_format
-                } for day in days]
-            }
@@ -230 +232 @@
-                'choices': [{
-                    'link': link({year_field: year_lookup, month_field: month.month}),
-"%s %s" % (month.strftime('%B'), month.year
+dateformat.format(month, year_month_format
-                } for month in months]
-            }