aboutsummaryrefslogtreecommitdiffstats
path: root/mediagoblin/auth/forms.py
diff options
context:
space:
mode:
Diffstat (limited to 'mediagoblin/auth/forms.py')
-rw-r--r--mediagoblin/auth/forms.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/mediagoblin/auth/forms.py b/mediagoblin/auth/forms.py
index 8f091d21..33e1f45c 100644
--- a/mediagoblin/auth/forms.py
+++ b/mediagoblin/auth/forms.py
@@ -17,7 +17,7 @@
import wtforms
from mediagoblin.tools.mail import normalize_email
-from mediagoblin.tools.translate import fake_ugettext_passthrough as _
+from mediagoblin.tools.translate import lazy_pass_to_ugettext as _
def normalize_user_or_email_field(allow_email=True, allow_user=True):
"""Check if we were passed a field that matches a username and/or email pattern
@@ -64,9 +64,9 @@ class RegistrationForm(wtforms.Form):
class LoginForm(wtforms.Form):
username = wtforms.TextField(
- _('Username'),
+ _('Username or Email'),
[wtforms.validators.Required(),
- normalize_user_or_email_field(allow_email=False)])
+ normalize_user_or_email_field()])
password = wtforms.PasswordField(
_('Password'),
[wtforms.validators.Required(),