--- a/web/lib/django/utils/translation/trans_null.py Wed May 19 17:43:59 2010 +0200
+++ b/web/lib/django/utils/translation/trans_null.py Tue May 25 02:43:45 2010 +0200
@@ -2,6 +2,7 @@
# that don't actually do anything. This is purely for performance, so that
# settings.USE_I18N = False can use this module rather than trans_real.py.
+import warnings
from django.conf import settings
from django.utils.encoding import force_unicode
from django.utils.safestring import mark_safe, SafeData
@@ -18,10 +19,10 @@
deactivate = deactivate_all = lambda: None
get_language = lambda: settings.LANGUAGE_CODE
get_language_bidi = lambda: settings.LANGUAGE_CODE in settings.LANGUAGES_BIDI
-get_date_formats = lambda: (settings.DATE_FORMAT, settings.DATETIME_FORMAT, settings.TIME_FORMAT)
-get_partial_date_formats = lambda: (settings.YEAR_MONTH_FORMAT, settings.MONTH_DAY_FORMAT)
check_for_language = lambda x: True
+# date formats shouldn't be used using gettext anymore. This
+# is kept for backward compatibility
TECHNICAL_ID_MAP = {
"DATE_WITH_TIME_FULL": settings.DATETIME_FORMAT,
"DATE_FORMAT": settings.DATE_FORMAT,
@@ -51,3 +52,21 @@
def get_language_from_request(request):
return settings.LANGUAGE_CODE
+
+# get_date_formats and get_partial_date_formats aren't used anymore by Django
+# but are kept for backward compatibility.
+def get_date_formats():
+ warnings.warn(
+ '`django.utils.translation.get_date_formats` is deprecated. '
+ 'Please update your code to use the new i18n aware formatting.',
+ PendingDeprecationWarning
+ )
+ return settings.DATE_FORMAT, settings.DATETIME_FORMAT, settings.TIME_FORMAT
+
+def get_partial_date_formats():
+ warnings.warn(
+ '`django.utils.translation.get_partial_date_formats` is deprecated. '
+ 'Please update your code to use the new i18n aware formatting.',
+ PendingDeprecationWarning
+ )
+ return settings.YEAR_MONTH_FORMAT, settings.MONTH_DAY_FORMAT