Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

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
Jannis Leidel authored February 14, 2011

Showing 1 changed file with 3 additions and 1 deletion. Show diff stats Hide diff stats

  1. 4  django/utils/translation/trans_real.py
4  django/utils/translation/trans_real.py
@@ -165,7 +165,9 @@ def _merge(path):
165 165
             if os.path.isdir(apppath):
166 166
                 res = _merge(apppath)
167 167
 
168  
-        if projectpath and os.path.isdir(projectpath) and projectpath not in settings.LOCALE_PATHS:
  168
+        localepaths = [os.path.normpath(path) for path in settings.LOCALE_PATHS]
  169
+        if (projectpath and os.path.isdir(projectpath) and
  170
+                os.path.normpath(projectpath) not in localepaths):
169 171
             res = _merge(projectpath)
170 172
 
171 173
         for localepath in reversed(settings.LOCALE_PATHS):

0 notes on commit 6b1191b

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