diff options
| author | Malcolm Tredinnick <malcolm.tredinnick@gmail.com> | 2007-11-28 21:51:17 +0000 |
|---|---|---|
| committer | Malcolm Tredinnick <malcolm.tredinnick@gmail.com> | 2007-11-28 21:51:17 +0000 |
| commit | a97abcffc27c5026041afccb1d76f7e4e4b1df69 (patch) | |
| tree | c6abc02b4d90e83788f6d156ca8efecb25cbae1c /django/utils/translation/trans_real.py | |
| parent | 5d85a5147b55cbe7940df2321e73c48ca265f649 (diff) | |
queryset-refactor: Merged from trunk up to [6724].
git-svn-id: http://code.djangoproject.com/svn/django/branches/queryset-refactor@6726 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'django/utils/translation/trans_real.py')
| -rw-r--r-- | django/utils/translation/trans_real.py | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/django/utils/translation/trans_real.py b/django/utils/translation/trans_real.py index c95c842a4f..a7259b3ce5 100644 --- a/django/utils/translation/trans_real.py +++ b/django/utils/translation/trans_real.py @@ -168,10 +168,9 @@ def translation(language): res.merge(t) return res - if hasattr(settings, 'LOCALE_PATHS'): - for localepath in settings.LOCALE_PATHS: - if os.path.isdir(localepath): - res = _merge(localepath) + for localepath in settings.LOCALE_PATHS: + if os.path.isdir(localepath): + res = _merge(localepath) if projectpath and os.path.isdir(projectpath): res = _merge(projectpath) |