Fixed #11384 - Make sure translations in the project directory really override translations in apps as specified in the docs.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@12447 bcc190cf-cafb-0310-a4f2-bffc1f526a37

1 files changed, 3 insertions, 3 deletions

diff --git a/django/utils/translation/trans_real.py b/django/utils/translation/trans_real.py
index e6e0a61201..7a66177f30 100644
--- a/django/utils/translation/trans_real.py
+++ b/django/utils/translation/trans_real.py
@@ -155,9 +155,6 @@ def translation(language):
             if os.path.isdir(localepath):
                 res = _merge(localepath)
 
-        if projectpath and os.path.isdir(projectpath):
-            res = _merge(projectpath)
-
         for appname in settings.INSTALLED_APPS:
             app = import_module(appname)
             apppath = os.path.join(os.path.dirname(app.__file__), 'locale')
@@ -165,6 +162,9 @@ def translation(language):
             if os.path.isdir(apppath):
                 res = _merge(apppath)
 
+        if projectpath and os.path.isdir(projectpath):
+            res = _merge(projectpath)
+
         if res is None:
             if fallback is not None:
                 res = fallback