summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClaude Paroz <claude@2xlibre.net>2014-05-25 21:25:23 +0200
committerClaude Paroz <claude@2xlibre.net>2014-05-25 21:25:23 +0200
commit2779c299c8b7e4556b5285acc86d17560522e702 (patch)
treee714d1af2a6f755fb0902a9a5f409e118fd24fb5
parentc5d73b687d21658e61ff63ba4dd477c8079a11c9 (diff)
Removed code deprecated from Django 1.2
-rw-r--r--django/utils/translation/trans_null.py16
1 files 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):