fixup! Fixed #1782 -- Added page to delete one's user account

Author: bmispelon

accounts/forms.py

@@ -42,9 +42,9 @@ def save(self, commit=True):
 
 class DeleteProfileForm(forms.Form):
     """
-    A form for delete the request's user and their associated data.
+    A form for deleting the request's user and their associated data.
 
-    This form has no fields, it's used as a container for validation and deltion
+    This form has no fields, it's used as a container for validation and deletion
     logic.
     """
 

accounts/tests.py

@@ -193,7 +193,7 @@ def test_profile_view_reversal(self):
             reverse("user_profile", host="www", args=[username])
 
 
-class UserDeletionTestCase(TestCase):
+class UserDeletionTests(TestCase):
     def create_user_and_form(self, bound=True, **userkwargs):
         userkwargs.setdefault("username", "test")
         userkwargs.setdefault("email", "[email protected]")

accounts/views.py

@@ -40,16 +40,15 @@ def edit_profile(request):
 def delete_profile(request):
     if request.method == "POST":
         form = DeleteProfileForm(data=request.POST, user=request.user)
-        if form.is_valid():
-            if form.delete():
-                logout(request)
-                return redirect("delete_profile_success")
+        if form.is_valid() and form.delete():
+            logout(request)
+            return redirect("delete_profile_success")
     else:
         form = DeleteProfileForm(user=request.user)
 
     context = {
         "form": form,
-        # Strings are left translated on purpose (ops prefer english :D)
+        # Strings are left untranslated on purpose (ops prefer english :D)
         "OPS_EMAIL_PRESETS": urlencode(
             {
                 "subject": "[djangoproject.com] Manual account deletion",

djangoproject/templates/accounts/delete_profile.html

@@ -12,15 +12,15 @@ <h2>{% translate "Could not delete account" %}</h2>
             That means there's probably some protected data still associated
             with your account.
             Please contact
-            <a href="mailto:[email protected]?{{ OPS_EMAIL_PRESETS }}">the operations team</a>
+            <a href="mailto:[email protected]?{{ OPS_EMAIL_PRESETS }}">the operations team</a>,
             and we'll sort it out for you.
         {% endblocktranslate %}</p>
     {% else %}
         <h2>{% translate "Are you sure?" %}</h2>
 
         <p>{% blocktranslate trimmed with username=request.user.username %}
             ⚠️ You are about to delete all data associated with the username
-            <strong>{{ username}}</strong>.
+            <strong>{{ username }}</strong>.
         {% endblocktranslate %}</p>
 
         <p>{% blocktranslate trimmed %}

djangoproject/templates/accounts/delete_profile_success.html

@@ -1,17 +1,16 @@
 {% extends "base.html" %}
-
 {% load i18n %}
 
 {% block content %}
     <h2>{% translate "Account deleted" %}</h2>
     <p>
-        {% translate "Your account and its data was successfully deleted and you've been logged out." %}
+        {% translate "Your account and its data were successfully deleted, and you've been logged out." %}
     </p>
     <p>
         {% url "community-index" as community_index_url %}
         {% blocktranslate trimmed %}
             Thanks for spending your time with us, we hope we'll still see you
-            around on our <a href="{{ community_index_url }}">various community spaces, online and off.
+            around on our <a href="{{ community_index_url }}">various community spaces</a>, online and off.
         {% endblocktranslate %}
     </p>
 {% endblock %}