Include Airy theme by default

[mediagoblin.git] / mediagoblin / auth / forms.py

diff --git a/mediagoblin/auth/forms.py b/mediagoblin/auth/forms.py
index 1be74aa672396575043acd19bf4b71cc30b97160..0b2bf9593384ddf77e8561519dd608ecfcfcc2c7 100644 (file)
--- a/mediagoblin/auth/forms.py
+++ b/mediagoblin/auth/forms.py
@@ -1,5 +1,5 @@
 # GNU MediaGoblin -- federated, autonomous media hosting
-# Copyright (C) 2011 Free Software Foundation, Inc
+# Copyright (C) 2011, 2012 MediaGoblin contributors.  See AUTHORS.
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as published by
@@ -17,7 +17,7 @@
 import wtforms
 import re
 
-from mediagoblin.util import fake_ugettext_passthrough as _
+from mediagoblin.tools.translate import fake_ugettext_passthrough as _
 
 
 class RegistrationForm(wtforms.Form):
@@ -29,13 +29,7 @@ class RegistrationForm(wtforms.Form):
     password = wtforms.PasswordField(
         _('Password'),
         [wtforms.validators.Required(),
-         wtforms.validators.Length(min=6, max=30),
-         wtforms.validators.EqualTo(
-                'confirm_password',
-                _('Passwords must match.'))])
-    confirm_password = wtforms.PasswordField(
-        _('Confirm password'),
-        [wtforms.validators.Required()])
+         wtforms.validators.Length(min=6, max=30)])
     email = wtforms.TextField(
         _('Email address'),
         [wtforms.validators.Required(),
@@ -54,30 +48,24 @@ class LoginForm(wtforms.Form):
 
 class ForgotPassForm(wtforms.Form):
     username = wtforms.TextField(
-        'Username or email',
+        _('Username or email'),
         [wtforms.validators.Required()])
 
-    def validate_username(form,field):
-        if not (re.match(r'^\w+$',field.data) or
-               re.match(r'^.+@[^.].*\.[a-z]{2,10}$',field.data, re.IGNORECASE)):
-            raise wtforms.ValidationError(u'Incorrect input')
+    def validate_username(form, field):
+        if not (re.match(r'^\w+$', field.data) or
+               re.match(r'^.+@[^.].*\.[a-z]{2,10}$', field.data,
+                        re.IGNORECASE)):
+            raise wtforms.ValidationError(_(u'Incorrect input'))
 
 
 class ChangePassForm(wtforms.Form):
     password = wtforms.PasswordField(
         'Password',
         [wtforms.validators.Required(),
-         wtforms.validators.Length(min=6, max=30),
-         wtforms.validators.EqualTo(
-                'confirm_password',
-                'Passwords must match.')])
-    confirm_password = wtforms.PasswordField(
-        'Confirm password',
-        [wtforms.validators.Required()])
+         wtforms.validators.Length(min=6, max=30)])
     userid = wtforms.HiddenField(
         '',
         [wtforms.validators.Required()])
     token = wtforms.HiddenField(
         '',
         [wtforms.validators.Required()])
-