Improve error response when attempting to register a deleted name.

r2/r2/controllers/api.py

@@ -427,6 +427,7 @@ class ApiController(RedditController):
     def POST_register(self, form, jquery, name, email,
                       password, dest, rem, reason):
         if not (form.has_errors("user", errors.BAD_USERNAME,
+                                errors.USERNAME_TAKEN_DEL,
                                 errors.USERNAME_TAKEN) or
                 form.has_errors("email", errors.BAD_EMAILS) or
                 form.has_errors("passwd", errors.BAD_PASSWORD) or

r2/r2/controllers/errors.py

@@ -31,6 +31,7 @@ error_list = dict((
         ('BAD_CAPTCHA', _('care to try these again?')),
         ('BAD_USERNAME', _('invalid user name')),
         ('USERNAME_TAKEN', _('that username is already taken')),
+        ('USERNAME_TAKEN_DEL', _('that username is taken by a deleted account')),
         ('NO_THING_ID', _('id not specified')),
         ('NOT_AUTHOR', _("you can't do that")),
         ('DELETED_LINK', _('the link you are commenting on has been deleted')),

r2/r2/controllers/validator/validator.py

@@ -803,7 +803,10 @@ class VUname(VRequired):
         else:
             try:
                 a = Account._by_name(user_name, True)
-                return self.error(errors.USERNAME_TAKEN)
+                if a._deleted:
+                   return self.error(errors.USERNAME_TAKEN_DEL)
+                else:
+                   return self.error(errors.USERNAME_TAKEN)
             except NotFound:
                 return user_name
 

r2/r2/templates/login.html

@@ -71,6 +71,7 @@
           %if register:
             ${error_field("BAD_USERNAME", "user", kind="span")}
             ${error_field("USERNAME_TAKEN", "user", kind="span")}
+            ${error_field("USERNAME_TAKEN_DEL", "user", kind="span")}
           %endif
         </li>
       %if register: