Merge branch 'master' into bootstrap

weblate/accounts/views.py

@@ -139,7 +139,7 @@ def user_profile(request):
         if appsettings.DEMO_SERVER and request.user.username == 'demo':
             messages.warning(
                 request,
-                _('You can not change demo profile on the demo server.')
+                _('You can not change demo account on the demo server.')
             )
             return redirect('profile')
 
@@ -206,7 +206,7 @@ def user_remove(request):
     if appsettings.DEMO_SERVER and request.user.username == 'demo':
         messages.warning(
             request,
-            _('You can not change demo profile on the demo server.')
+            _('You can not change demo account on the demo server.')
         )
         return redirect('profile')
 
@@ -443,6 +443,12 @@ 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')
 
     do_change = False