Ticket #7916: 7916_v2.diff

core/management/commands/makemessages.py

@@ -59 +59 @@
             os.unlink(potfile)
 
         all_files = []
-        for (dirpath, dirnames, filenames) in os.walk("."):
-            all_files.extend([(dirpath, f) for f in filenames])
+        for dir_content in os.listdir('.'):
+            if os.path.isfile(dir_content):
+                all_files.append(('.', dir_content))
+            elif not os.path.isdir(os.path.join(dir_content, 'locale', locale)) and not os.path.isdir(os.path.join(dir_content, 'conf', 'locale', locale)):
+                for (dirpath, dirnames, filenames) in os.walk(dir_content):
+                    all_files.extend([(dirpath, f) for f in filenames])
         all_files.sort()
         for dirpath, file in all_files:
             if domain == 'djangojs' and file.endswith('.js'):