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:26:44 +0200
commit0c685ab64fcfb46bcd8cfa9b2d2a22d94f6223b3 (patch)
tree11fb7378a99189f431a88300d4eca1dae1e10abb
parentdbdbda87fc38816c45584ea7a97876078cbffb3a (diff)
[1.7.x] Removed code deprecated from Django 1.2
Backport of 2779c299c8 from master.
-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):