Merge pull request #2 from udacity/update_django

[osqa.git] / forum / settings / __init__.py

diff --git a/forum/settings/__init__.py b/forum/settings/__init__.py
index 9b0cbed037702599ddd57605e223b820a896a94f..4120d2ba6737f5df56ac3b01466aa641e0898193 100644 (file)
--- a/forum/settings/__init__.py
+++ b/forum/settings/__init__.py
@@ -1,13 +1,20 @@
 import os.path
-from base import Setting, SettingSet
+from base import Setting, SettingSet, BaseSetting
 
 from django.forms.widgets import Textarea
 from django.utils.translation import ugettext_lazy as _
 from django.conf import settings as djsettings
-from django.utils.version import get_svn_revision
+from django.utils.version import get_git_changeset
+
+from forum.modules import get_modules_script_implementations
 
 OSQA_VERSION = "Development Build"
-SVN_REVISION = get_svn_revision(djsettings.SITE_SRC_ROOT)
+
+VCS_REVISION = get_git_changeset()
+
+# We'll have to keep in mind this variable on every release.
+if VCS_REVISION == u'SVN-unknown':
+    VCS_REVISION = u'SVN-1000'
 
 MAINTAINANCE_MODE = Setting('MAINTAINANCE_MODE', None)
 
@@ -16,10 +23,10 @@ DJSTYLE_ADMIN_INTERFACE = Setting('DJSTYLE_ADMIN_INTERFACE', True)
 NODE_MAN_FILTERS = Setting('NODE_MAN_FILTERS', [])
 
 APP_URL = djsettings.APP_URL
-FORUM_SCRIPT_ALIAS = djsettings.FORUM_SCRIPT_ALIAS
+APP_BASE_URL = djsettings.APP_BASE_URL
+FORCE_SCRIPT_NAME = djsettings.FORCE_SCRIPT_NAME
 OSQA_SKIN = djsettings.OSQA_DEFAULT_SKIN
 LANGUAGE_CODE = djsettings.LANGUAGE_CODE
-ADMIN_MEDIA_PREFIX = djsettings.ADMIN_MEDIA_PREFIX
 ONLINE_USERS = Setting('ONLINE_USERS', {})
 
 
@@ -40,8 +47,17 @@ from users import *
 from static import *
 from urls import *
 from accept import *
+from sitemaps import *
+
+__all__ = locals().keys()
+
+# Be able to import all module settings as well
+for k,v in get_modules_script_implementations('settings', BaseSetting).items():
+   if not k in __all__:
+        __all__.append(k)
+        exec "%s = v" % k
+
 
 BADGES_SET = SettingSet('badges', _('Badges config'), _("Configure badges on your OSQA site."), 500)
 
-#__all__ = locals().keys()