Django 1.7 compatibility fix.

[django-cas-provider.git] / cas_provider / views.py

diff --git a/cas_provider/views.py b/cas_provider/views.py
index 1160882..976c271 100644 (file)
--- a/cas_provider/views.py
+++ b/cas_provider/views.py
@@ -18,6 +18,7 @@ from django.conf import settings
 from django.contrib.auth import login as auth_login, logout as auth_logout
 from django.core.urlresolvers import get_callable
 from django.shortcuts import render_to_response
+from django.utils.translation import ugettext as _
 from django.template import RequestContext
 from django.contrib.auth import authenticate
 from django.core.urlresolvers import reverse
@@ -124,7 +125,7 @@ def login(request, template_name='cas/login.html',
                     return HttpResponseRedirect(url)
 
             if user is None:
-                errors.append('Incorrect username and/or password.')
+                errors.append(_('Incorrect username and/or password.'))
             else:
                 if user.is_active:
                     auth_login(request, user)
@@ -138,7 +139,7 @@ def login(request, template_name='cas/login.html',
     if user is not None and user.is_authenticated():
         # We have an authenticated user.
         if not user.is_active:
-            errors.append('This account is disabled. Please contact us if you feel it should be enabled again.')
+            errors.append(_('This account is disabled. Please contact us if you feel it should be enabled again.'))
         else:
             # Send the on_cas_login signal. If we get an HttpResponse, return that.
             for receiver, response in signals.on_cas_login.send(sender=login, request=request, **kwargs):
@@ -342,7 +343,7 @@ def _cas2_proxy_success(pt):
 
 
 def _cas2_sucess_response(user, pgt=None, proxies=None):
-    return HttpResponse(auth_success_response(user, pgt, proxies), mimetype='text/xml')
+    return HttpResponse(auth_success_response(user, pgt, proxies), content_type='text/xml')
 
 
 def _cas2_error_response(code, message=None):
@@ -353,7 +354,7 @@ def _cas2_error_response(code, message=None):
         </cas:serviceResponse>''' % {
         'code': code,
         'message': message if message else dict(ERROR_MESSAGES).get(code)
-    }, mimetype='text/xml')
+    }, content_type='text/xml')
 
 
 def proxy_success(pt):