Changeset 3055

Timestamp:

06/01/06 23:20:32 (2 years ago)

Author:

adrian

Message:

Fixed #2062 -- Added YEAR_MONTH_FORMAT and MONTH_DAY_FORMAT settings, and added technical message IDs of the same names. Thanks, ramiro

Files:

• django/trunk/django/conf/global_settings.py (modified) (1 diff)
• django/trunk/django/utils/translation.py (modified) (2 diffs)
• django/trunk/docs/settings.txt (modified) (5 diffs)

django/trunk/django/conf/global_settings.py

@@ -204 +204 @@
-TIME_FORMAT = 'P'
-
+# Default formatting for date objects when only the year and month are relevant.
+# See all available format strings here:
+# http://www.djangoproject.com/documentation/templates/#now
+YEAR_MONTH_FORMAT = 'F Y'
+
+# Default formatting for date objects when only the month and day are relevant.
+# See all available format strings here:
+# http://www.djangoproject.com/documentation/templates/#now
+MONTH_DAY_FORMAT = 'F j'
+
-# Whether to enable Psyco, which optimizes Python code. Requires Psyco.
-# http://psyco.sourceforge.net/

django/trunk/django/utils/translation.py

@@ -222 +222 @@
-    True = right-to-left layout
-    """
-
+
-    from django.conf import settings
-    return get_language() in settings.LANGUAGES_BIDI
-
+
-def catalog():
-    """
@@ -370 +370 @@
-    if time_format == 'TIME_FORMAT':
-        time_format = settings.TIME_FORMAT
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-def install():

django/trunk/docs/settings.txt

@@ -292 +292 @@
-`allowed date format strings`_.
-
- and TIME
+, TIME_FORMAT, YEAR_MONTH_FORMAT and MONTH_DAY
-
-.. _allowed date format strings: http://www.djangoproject.com/documentation/templates/#now
@@ -305 +305 @@
-`allowed date format strings`_.
-
- and TIME
+, DATETIME_FORMAT, TIME_FORMAT, YEAR_MONTH_FORMAT and MONTH_DAY
-
-.. _allowed date format strings: http://www.djangoproject.com/documentation/templates/#now
@@ -533 +533 @@
-A tuple of middleware classes to use. See the `middleware docs`_.
-
+MONTH_DAY_FORMAT
+----------------
+
+Default: ``'F j'``
+
+The default formatting to use for date fields on Django admin change-list
+pages -- and, possibly, by other parts of the system -- in cases when only the
+month and day are displayed.
+
+For example, when a Django admin change-list page is being filtered by a date
+drilldown, the header for a given day displays the day and month. Different
+locales have different formats. For example, U.S. English would say
+"January 1," whereas Spanish might say "1 Enero."
+
+See `allowed date format strings`_. See also DATE_FORMAT, DATETIME_FORMAT,
+TIME_FORMAT and YEAR_MONTH_FORMAT.
+
-PREPEND_WWW
------------
@@ -697 +714 @@
-`allowed date format strings`_.
-
-
+
+
-
-.. _allowed date format strings: http://www.djangoproject.com/documentation/templates/#now
@@ -720 +738 @@
-bandwidth but slows down performance. This is only used if ``CommonMiddleware``
-is installed (see the `middleware docs`_).
+
+YEAR_MONTH_FORMAT
+-----------------
+
+Default: ``'F Y'``
+
+The default formatting to use for date fields on Django admin change-list
+pages -- and, possibly, by other parts of the system -- in cases when only the
+year and month are displayed.
+
+For example, when a Django admin change-list page is being filtered by a date
+drilldown, the header for a given month displays the month and the year.
+Different locales have different formats. For example, U.S. English would say
+"January 2006," whereas another locale might say "2006/January."
+
+See `allowed date format strings`_. See also DATE_FORMAT, DATETIME_FORMAT,
+TIME_FORMAT and MONTH_DAY_FORMAT.
-
-.. _cache docs: http://www.djangoproject.com/documentation/cache/