Ticket #10765: settings_folder_problem.diff

django/utils/translation/trans_real.py

@@ -127 +127 @@
     if settings.SETTINGS_MODULE is not None:
         parts = settings.SETTINGS_MODULE.split('.')
         project = import_module(parts[0])
-        projectpath = os.path.join(os.path.dirname(project.__file__), 'locale')
+        
+        # If the settings module is a folder, 
+        # the projectpath must be retrieved in a different way.
+        # Maybe it's the case of adding a constant or a function
+        # to get this info anywhere in django.
+        if os.path.basename(project.__file__).startswith('__init__.py'):
+            projectpath = os.path.join(os.path.dirname(os.path.dirname(project.__file__)), 'locale')
+        else:
+            projectpath = os.path.join(os.path.dirname(project.__file__), 'locale')
     else:
         projectpath = None