Commit 6b1191b1 authored by Jannis Leidel's avatar Jannis Leidel
Browse files

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
parent 756f1c21

django/utils/translation/trans_real.py

+3 −1
Original line number Diff line number Diff line
@@ -165,7 +165,9 @@ def translation(language): 
            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):