Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Normalize the locale paths when considering merging a project languag…

…e catalogue. Refs #14924.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@15529 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit 6b1191b1a2cecb48661d476b3a7f17e17c0d819c 1 parent 756f1c2
@jezdez jezdez authored
Showing with 3 additions and 1 deletion.
  1. +3 −1 django/utils/translation/trans_real.py
View
4 django/utils/translation/trans_real.py
@@ -165,7 +165,9 @@ def _merge(path):
if os.path.isdir(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)
for localepath in reversed(settings.LOCALE_PATHS):

0 comments on commit 6b1191b

Please sign in to comment.
Something went wrong with that request. Please try again.