Create edit_account.html

1 files changed, 11 insertions, 12 deletions

diff --git a/mediagoblin/edit/forms.py b/mediagoblin/edit/forms.py
index 406de3f8..df219011 100644
--- a/mediagoblin/edit/forms.py
+++ b/mediagoblin/edit/forms.py
@@ -37,7 +37,7 @@ class EditForm(wtforms.Form):
         _('Slug'),
         [wtforms.validators.Required(message=_("The slug can't be empty"))],
         description=_(
-            "The title part of this media's URL. "
+            "The title part of this media's address. "
             "You usually don't need to change this."))
 
 
@@ -52,20 +52,19 @@ class EditProfileForm(wtforms.Form):
     url = wtforms.TextField(
         _('Website'),
         [wtforms.validators.Optional(),
-         wtforms.validators.URL(message='Improperly formed URL')])
+         wtforms.validators.URL(message="""This address contains errors""")])
+
+
+class EditAccountForm(wtforms.Form):
     old_password = wtforms.PasswordField(
         _('Old password'),
-        [wtforms.validators.Optional()])
+        [wtforms.validators.Required()],
+        description=_(
+            "Enter your old password to prove you own this account."))
     new_password = wtforms.PasswordField(
-        _('New Password'),
-        [wtforms.validators.Optional(),
-         wtforms.validators.Length(min=6, max=30),
-         wtforms.validators.EqualTo(
-                'confirm_password',
-                'Passwords must match.')])
-    confirm_password = wtforms.PasswordField(
-        'Confirm password',
-        [wtforms.validators.Optional()])
+        _('New password'),
+        [wtforms.validators.Required(),
+         wtforms.validators.Length(min=6, max=30)])
 
 
 class EditAttachmentsForm(wtforms.Form):