Merge pull request #5 from lra/french

[osqa.git] / forum / context.py

diff --git a/forum/context.py b/forum/context.py
index 3814bb6065d46d91a48969a4ac599bc3cff4deb0..957b5f91d800c55d2a5924f0d50abdd958dffe90 100644 (file)
--- a/forum/context.py
+++ b/forum/context.py
@@ -1,48 +1,17 @@
-from django.conf import settings
+from forum import settings
+

 def application_settings(context):
 def application_settings(context):

-    my_settings = {
-        'APP_TITLE' : settings.APP_TITLE,
-        'APP_SHORT_NAME' : settings.APP_SHORT_NAME,
-        '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,
-        'FEEDBACK_SITE_URL': settings.FEEDBACK_SITE_URL,
-        'FORUM_SCRIPT_ALIAS': settings.FORUM_SCRIPT_ALIAS,
-        'LANGUAGE_CODE': settings.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,
-        'APP_FAVICON':settings.APP_FAVICON,
-        }
-    return {'settings':my_settings}
+    return {'settings': settings}

 
 def auth_processor(request):
 
 def auth_processor(request):

-    """
-    Returns context variables required by apps that use Django's authentication
-    system.
-
-    If there is no 'user' attribute in the request, uses AnonymousUser (from
-    django.contrib.auth).
-    """

     if hasattr(request, 'user'):
         user = request.user
     if hasattr(request, 'user'):
         user = request.user

-        if user.is_authenticated():
-            messages = user.message_set.all()
-        else:
-            messages = None

     else:
         from django.contrib.auth.models import AnonymousUser
         user = AnonymousUser()
     else:
         from django.contrib.auth.models import AnonymousUser
         user = AnonymousUser()

-        messages = None

 
     from django.core.context_processors import PermWrapper
     return {
         'user': user,
 
     from django.core.context_processors import PermWrapper
     return {
         'user': user,

-        'messages': messages,

         'perms': PermWrapper(user),
     }
         'perms': PermWrapper(user),
     }