Tweaked delete messages, added slugs to mod links.

misago/templates/misago/profile/base.html

@@ -75,11 +75,11 @@
               {% if profile.acl_.can_delete %}
               <li class="divider"></li>
               <li>
-                <form action="{% url 'misago:delete_user' user_id=profile.pk %}" method="post" class="delete-user-prompt">
+                <form action="{% url 'misago:delete_user' user_slug=user.slug user_id=profile.pk %}" method="post" class="delete-user-prompt">
                   {% csrf_token %}
                   <button type="submit" class="btn">
                     <span class="fa fa-times-circle"></span>
-                    {% trans "Delete user and content" %}
+                    {% trans "Delete user" %}
                   </button>
                 </form>
               </li>
@@ -116,7 +116,7 @@
   $(function() {
     {% if profile.acl_.can_delete %}
     $('.delete-user-prompt').submit(function() {
-      var decision = confirm("{% trans "Are you sure you want to delete this user and all of his/hers all content?" %}");
+      var decision = confirm("{% trans "Are you sure you want to delete this user? This will also delete all content associated with this account." %}");
       return decision;
     });
     {% endif %}

misago/users/urls.py

@@ -53,7 +53,7 @@ urlpatterns += patterns('misago.users.views.usercp',
 
 
 urlpatterns += patterns('',
-    url(r'^user/(?P<user_slug>[a-z0-9]+)-(?P<user_id>\d+)/', include(patterns('misago.users.views.profile',
+    url(r'^user/(?P<user_slug>[a-zA-Z0-9]+)-(?P<user_id>\d+)/', include(patterns('misago.users.views.profile',
         url(r'^$', 'user_posts', name="user_posts"),
         url(r'^threads/$', 'user_threads', name="user_threads"),
         url(r'^name-history/$', 'name_history', name="user_name_history"),
@@ -63,7 +63,7 @@ urlpatterns += patterns('',
 
 
 urlpatterns += patterns('',
-    url(r'^mod-user/(?P<user_id>\d+)/', include(patterns('misago.users.views.moderation',
+    url(r'^moderate-user/(?P<user_slug>[a-zA-Z0-9]+)-(?P<user_id>\d+)/', include(patterns('misago.users.views.moderation',
         url(r'^delete/$', 'delete', name='delete_user'),
     ))),
 )

misago/users/views/admin/users.py

@@ -60,14 +60,16 @@ class UsersList(UserAdmin, generic.ListView):
             'action': 'delete_accounts',
             'name': _("Delete accounts"),
             'icon': 'fa fa-times-circle',
-            'confirmation': _("Are you sure you want to delete those users?"),
+            'confirmation': _("Are you sure you want "
+                              "to delete selected users?"),
         },
         {
             'action': 'delete_all',
             'name': _("Delete all"),
             'icon': 'fa fa-eraser',
-            'confirmation': _("Are you sure you want to delete both "
-                              "selected users and their content?"),
+            'confirmation': _("Are you sure you want to delete selected "
+                              "users? This will also delete all content "
+                              "associated with their accounts."),
         }
     ]
 
@@ -160,7 +162,7 @@ class UsersList(UserAdmin, generic.ListView):
         for user in users:
             user.delete(delete_content=True)
 
-        message = _("Selected users have been deleted with their content.")
+        message = _("Selected users and their content has been deleted.")
         messages.success(request, message)
 
 

misago/users/views/moderation.py

@@ -1,11 +1,12 @@
 from django.contrib import messages
 from django.contrib.auth import get_user_model
 from django.db import transaction
-from django.shortcuts import get_object_or_404, redirect, render
+from django.shortcuts import redirect, render
 from django.utils.translation import ugettext as _
 
 from misago.acl import add_acl
 from misago.core.decorators import require_POST
+from misago.core.shortcuts import get_object_or_404, validate_slug
 
 from misago.users.permissions.delete import allow_delete_user
 
@@ -18,6 +19,7 @@ def user_moderation_view(required_permission=None):
             user_id = kwargs.pop('user_id')
 
             kwargs['user'] = get_object_or_404(queryset, id=user_id)
+            validate_slug(kwargs['user'], kwargs.pop('user_slug'))
             add_acl(request.user, kwargs['user'])
 
             if required_permission:
@@ -33,6 +35,6 @@ def user_moderation_view(required_permission=None):
 def delete(request, user):
     user.delete(delete_content=True)
 
-    message = _("User %(username)s has been deleted with all content.")
+    message = _("User %(username)s has been deleted.")
     messages.success(request, message % {'username': user.username})
     return redirect('misago:index')