modifications mineures sur .po / modif des chemins dansw-ana

editchoicesadmin.html et editchoicesuser.html, ainsi que dans feeds.py et
views.py
manage.py est fortement modifie

1 files changed, 19 insertions, 8 deletions

diff --git a/papillon/manage.py b/papillon/manage.py
index bcdd55e..3bd32f1 100755
--- a/papillon/manage.py
+++ b/papillon/manage.py
@@ -1,11 +1,22 @@
 #!/usr/bin/python
-from django.core.management import execute_manager
-try:
-    import settings # Assumed to be in the same directory.
-except ImportError:
-    import sys
-    sys.stderr.write("Error: Can't find the file 'settings.py' in the directory containing %r. It appears you've customized things.\nYou'll have to run django-admin.py, passing it your settings module.\n(If the file settings.py does indeed exist, it's causing an ImportError somehow.)\n" % __file__)
-    sys.exit(1)
+import os
+import sys
+# from django.core.management import execute_manager
+# try:
+    # import settings # Assumed to be in the same directory.
+# except ImportError:
+
+    # import sys
+    # sys.stderr.write("Error: Can't find the file 'settings.py' in the directory containing %r. It appears you've customized things.\nYou'll have to run django-admin.py, passing it your settings module.\n(If the file settings.py does indeed exist, it's causing an ImportError somehow.)\n" % __file__)
+    # sys.exit(1)
+
+# if __name__ == "__main__":
+    # execute_manager(settings)
 
 if __name__ == "__main__":
-    execute_manager(settings)
+
+    os.environ.setdefault("DJANGO_SETTINGS_MODULE", "papillon.settings")
+
+    from django.core.management import execute_from_command_line
+
+    execute_from_command_line(sys.argv)
\ No newline at end of file