From 2779c299c8b7e4556b5285acc86d17560522e702 Mon Sep 17 00:00:00 2001 From: Claude Paroz Date: Sun, 25 May 2014 21:25:23 +0200 Subject: [PATCH] Removed code deprecated from Django 1.2 --- django/utils/translation/trans_null.py | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/django/utils/translation/trans_null.py b/django/utils/translation/trans_null.py index 75dedda5f7..fa4f0af668 100644 --- a/django/utils/translation/trans_null.py +++ b/django/utils/translation/trans_null.py @@ -31,23 +31,11 @@ get_language = lambda: settings.LANGUAGE_CODE get_language_bidi = lambda: settings.LANGUAGE_CODE in settings.LANGUAGES_BIDI 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, - "DATETIME_FORMAT": settings.DATETIME_FORMAT, - "TIME_FORMAT": settings.TIME_FORMAT, - "YEAR_MONTH_FORMAT": settings.YEAR_MONTH_FORMAT, - "MONTH_DAY_FORMAT": settings.MONTH_DAY_FORMAT, -} - def gettext(message): - result = TECHNICAL_ID_MAP.get(message, message) if isinstance(message, SafeData): - return mark_safe(result) - return result + return mark_safe(message) + return message def ugettext(message):