X-Git-Url: https://git.openstreetmap.org./osqa.git/blobdiff_plain/1a949f7c97dc2f34c135f5cdf088df2927d3d652..0cfc940c3e7643ed83e8d54f647c7e09d80c1bc4:/forum/context.py?ds=sidebyside diff --git a/forum/context.py b/forum/context.py index 3814bb6..6048261 100644 --- a/forum/context.py +++ b/forum/context.py @@ -1,23 +1,28 @@ -from django.conf import settings +from forum import settings +from django.conf import settings as djsettings + def application_settings(context): my_settings = { 'APP_TITLE' : settings.APP_TITLE, 'APP_SHORT_NAME' : settings.APP_SHORT_NAME, + 'SHOW_WELCOME_BOX' : settings.SHOW_WELCOME_BOX, 'APP_URL' : settings.APP_URL, 'APP_KEYWORDS' : settings.APP_KEYWORDS, 'APP_DESCRIPTION' : settings.APP_DESCRIPTION, 'APP_INTRO' : settings.APP_INTRO, 'APP_LOGO' : settings.APP_LOGO, - 'EMAIL_VALIDATION': settings.EMAIL_VALIDATION, + 'EMAIL_VALIDATION': 'off', 'FEEDBACK_SITE_URL': settings.FEEDBACK_SITE_URL, - 'FORUM_SCRIPT_ALIAS': settings.FORUM_SCRIPT_ALIAS, - 'LANGUAGE_CODE': settings.LANGUAGE_CODE, + 'FORUM_SCRIPT_ALIAS': djsettings.FORUM_SCRIPT_ALIAS, + 'LANGUAGE_CODE': djsettings.LANGUAGE_CODE, 'GOOGLE_SITEMAP_CODE':settings.GOOGLE_SITEMAP_CODE, 'GOOGLE_ANALYTICS_KEY':settings.GOOGLE_ANALYTICS_KEY, 'WIKI_ON':settings.WIKI_ON, - 'RESOURCE_REVISION':settings.RESOURCE_REVISION, - 'OSQA_SKIN':settings.OSQA_DEFAULT_SKIN, + 'OSQA_SKIN':djsettings.OSQA_DEFAULT_SKIN, 'APP_FAVICON':settings.APP_FAVICON, + 'OSQA_VERSION': settings.OSQA_VERSION, + 'ADMIN_MEDIA_PREFIX': djsettings.ADMIN_MEDIA_PREFIX, + 'SVN_REVISION': settings.SVN_REVISION, } return {'settings':my_settings}