innov
/
django1
1
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

Normalize the locale paths when considering merging a project language catalogue. Refs #14924. 

git-svn-id: http://code.djangoproject.com/svn/django/trunk@15529 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Jannis Leidel 2011-02-14 01:42:12 +00:00
parent 756f1c218d
commit 6b1191b1a2
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
django/utils/translation/trans_real.py
View File

@ -165,7 +165,9 @@ def translation(language):
if os.path.isdir(apppath): if os.path.isdir(apppath):
res = _merge(apppath) res = _merge(apppath)
if projectpath and os.path.isdir(projectpath) and projectpath not in settings.LOCALE_PATHS: localepaths = [os.path.normpath(path) for path in settings.LOCALE_PATHS]
if (projectpath and os.path.isdir(projectpath) and
os.path.normpath(projectpath) not in localepaths):
res = _merge(projectpath) res = _merge(projectpath)
for localepath in reversed(settings.LOCALE_PATHS): for localepath in reversed(settings.LOCALE_PATHS):