Merge branch 'master' into bootstrap

weblate/accounts/views.py

@@ -120,6 +120,17 @@ def mail_admins_contact(request, subject, message, context, sender):
     )
 
 
+def deny_demo(request):
+    """
+    Denies editing of demo account on demo server.
+    """
+    messages.warning(
+        request,
+        _('You can not change demo account on the demo server.')
+    )
+    return redirect('profile')
+
+
 @login_required
 def user_profile(request):
 
@@ -137,11 +148,7 @@ def user_profile(request):
         forms.append(UserForm(request.POST, instance=request.user))
 
         if appsettings.DEMO_SERVER and request.user.username == 'demo':
-            messages.warning(
-                request,
-                _('You can not change demo account on the demo server.')
-            )
-            return redirect('profile')
+            return deny_demo()
 
         if min([form.is_valid() for form in forms]):
             # Save changes
@@ -204,11 +211,7 @@ def user_profile(request):
 @login_required
 def user_remove(request):
     if appsettings.DEMO_SERVER and request.user.username == 'demo':
-        messages.warning(
-            request,
-            _('You can not change demo account on the demo server.')
-        )
-        return redirect('profile')
+        return deny_demo()
 
     if request.method == 'POST':
         remove_user(request.user)
@@ -444,11 +447,7 @@ def password(request):
     Password change / set form.
     '''
     if appsettings.DEMO_SERVER and request.user.username == 'demo':
-        messages.warning(
-            request,
-            _('You can not change demo account on the demo server.')
-        )
-        return redirect('profile')
+        return deny_demo()
 
     do_change = False