Merge branch 'master' of git://github.com/evgenyfadeev/CNPROG

 * Merge of Spanish translation, still missing some texts.
 * Custom colors for preguntalo project

Conflicts:
	locale/es/LC_MESSAGES/django.mo
	locale/es/LC_MESSAGES/django.po
	templates/content/style/style.css

1 files changed, 33 insertions, 2 deletions

diff --git a/context.py b/context.py
index f420b154..c068332c 100644
--- a/context.py
+++ b/context.py
@@ -1,9 +1,40 @@
 from django.conf import settings
 def application_settings(context):
-    return {
+    my_settings = {
         'APP_TITLE' : settings.APP_TITLE,
         'APP_URL'   : settings.APP_URL,
         'APP_KEYWORDS' : settings.APP_KEYWORDS,
         'APP_DESCRIPTION' : settings.APP_DESCRIPTION,
-        'APP_INTRO' : settings.APP_INTRO
+        'APP_INTRO' : settings.APP_INTRO,
+        'EMAIL_VALIDATION': settings.EMAIL_VALIDATION,
+        'LANGUAGE_CODE': settings.LANGUAGE_CODE,
+        'GOOGLE_SITEMAP_CODE':settings.GOOGLE_SITEMAP_CODE,
+        'GOOGLE_ANALYTICS_KEY':settings.GOOGLE_ANALYTICS_KEY,
         }
+    return {'settings':my_settings}
+
+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 user.is_authenticated():
+            messages = user.message_set.all()
+        else:
+            messages = None
+    else:
+        from django.contrib.auth.models import AnonymousUser
+        user = AnonymousUser()
+        messages = None
+
+    from django.core.context_processors import PermWrapper
+    return {
+        'user': user,
+        'messages': messages,
+        'perms': PermWrapper(user),
+    }