diff options
| author | Adrian Holovaty <adrian@holovaty.com> | 2006-07-08 13:58:33 +0000 |
|---|---|---|
| committer | Adrian Holovaty <adrian@holovaty.com> | 2006-07-08 13:58:33 +0000 |
| commit | 18eb7ecb13ea4f661d3820a8e89c6abdb8b3e419 (patch) | |
| tree | 5cd03bc26569602e4dec3c3d3cd25e27cb35824c | |
| parent | 8daddd4faed9f79d86137836b67cd5aad3fa0704 (diff) | |
| download | django-18eb7ecb13ea4f661d3820a8e89c6abdb8b3e419.tar.gz | |
Fixed #2310 -- Changed trans_null.py to use settings.LANGUAGE_CODE instead of hard-coded 'en'
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3298 bcc190cf-cafb-0310-a4f2-bffc1f526a37
| -rw-r--r-- | django/utils/translation/trans_null.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/django/utils/translation/trans_null.py b/django/utils/translation/trans_null.py index 7a3163cfa5..e3a97d4912 100644 --- a/django/utils/translation/trans_null.py +++ b/django/utils/translation/trans_null.py @@ -13,6 +13,6 @@ gettext = gettext_noop = gettext_lazy = _ = lambda x: x string_concat = lambda *strings: ''.join([str(el) for el in strings]) activate = lambda x: None deactivate = install = lambda: None -get_language = lambda: 'en' +get_language = lambda: settings.LANGUAGE_CODE 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 |