mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-10-30 17:16:10 +00:00
Code Issues 32 Releases Wiki Activity

[1.7.x] Removed code deprecated from Django 1.2

Browse Source 
Backport of 2779c299c8 from master.
This commit is contained in:
Claude Paroz
2014-05-25 21:25:23 +02:00
parent dbdbda87fc
commit 0c685ab64f
1 changed files with 2 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
django/utils/translation/trans_null.py
View File

@@ -31,23 +31,11 @@ get_language = lambda: settings.LANGUAGE_CODE
get_language_bidi = lambda: settings.LANGUAGE_CODE in settings.LANGUAGES_BIDI get_language_bidi = lambda: settings.LANGUAGE_CODE in settings.LANGUAGES_BIDI
check_for_language = lambda x: True 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): def gettext(message):
result = TECHNICAL_ID_MAP.get(message, message)
if isinstance(message, SafeData): if isinstance(message, SafeData):
return mark_safe(result) return mark_safe(message)
return result return message
def ugettext(message): def ugettext(message):