call it "username" because that's what it is (bug 698064)

Author: cvan

apps/amo/utils.py

@@ -298,16 +298,16 @@ def slugify(s, ok=SLUG_OK, lower=True, spaces=False, delimiter='-'):
     return new.lower() if lower else new
 
 
-def slug_validator(s, ok=SLUG_OK, lower=True, spaces=False, delimiter='-'):
+def slug_validator(s, ok=SLUG_OK, lower=True, spaces=False, delimiter='-',
+                   message=validate_slug.message, code=validate_slug.code):
     """
     Raise an error if the string has any punctuation characters.
 
     Regexes don't work here because they won't check alnums in the right
     locale.
     """
     if not (s and slugify(s, ok, lower, spaces, delimiter) == s):
-        raise ValidationError(validate_slug.message,
-                              code=validate_slug.code)
+        raise ValidationError(message, code=code)
 
 
 def raise_required():

apps/users/forms.py

@@ -157,7 +157,9 @@ class UsernameMixin:
 
     def clean_username(self):
         name = self.cleaned_data['username']
-        slug_validator(name, lower=False)
+        slug_validator(name, lower=False,
+            message=_('Enter a valid username consisting of letters, numbers, '
+                      'underscores or hyphens.'))
         if BlacklistedUsername.blocked(name):
             raise forms.ValidationError(_('This username cannot be used.'))
         return name

apps/users/tests/test_forms.py

@@ -3,7 +3,6 @@
 from django.contrib.auth.models import User
 from django.contrib.auth.tokens import default_token_generator
 from django.core import mail
-from django.core.validators import validate_slug
 from django.utils.http import int_to_base36
 
 from django.conf import settings
@@ -399,7 +398,9 @@ def test_invalid_username(self):
                 'password2': 'xxxlonger',
                 'username': 'Todd/Rochelle', }
         r = self.client.post('/en-US/firefox/users/register', data)
-        self.assertFormError(r, 'form', 'username', validate_slug.message)
+        self.assertFormError(r, 'form', 'username',
+            'Enter a valid username consisting of letters, numbers, '
+            'underscores or hyphens.')
 
     def test_blacklisted_username(self):
         data = {'email': 'testo@example.com',