From 6b1191b1a2cecb48661d476b3a7f17e17c0d819c Mon Sep 17 00:00:00 2001 From: Jannis Leidel Date: Mon, 14 Feb 2011 01:42:12 +0000 Subject: [PATCH] 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 --- django/utils/translation/trans_real.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/django/utils/translation/trans_real.py b/django/utils/translation/trans_real.py index 2495cdd0c8..675fb3f4ae 100644 --- a/django/utils/translation/trans_real.py +++ b/django/utils/translation/trans_real.py @@ -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):