Dot-Notation: Some random places

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

diff --git a/mediagoblin/edit/forms.py b/mediagoblin/edit/forms.py
index f81d58b24819d4843afd990febd5c8357b8418da..099558742bd5189cbf32380cda9b6942d39f942f 100644 (file)
--- a/mediagoblin/edit/forms.py
+++ b/mediagoblin/edit/forms.py
@@ -14,37 +14,58 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-
 import wtforms
 
-from mediagoblin.util import tag_length_validator, TOO_LONG_TAG_WARNING
-from mediagoblin.util import fake_ugettext_passthrough as _
-
+from mediagoblin.tools.text import tag_length_validator, TOO_LONG_TAG_WARNING
+from mediagoblin.tools.translate import fake_ugettext_passthrough as _
 
 class EditForm(wtforms.Form):
     title = wtforms.TextField(
         _('Title'),
         [wtforms.validators.Length(min=0, max=500)])
-    description = wtforms.TextAreaField('Description of this work')
+    description = wtforms.TextAreaField(
+        _('Description of this work'),
+        description=_("""You can use
+                      <a href="http://daringfireball.net/projects/markdown/basics">
+                      Markdown</a> for formatting."""))
     tags = wtforms.TextField(
         _('Tags'),
-        [tag_length_validator])
+        [tag_length_validator],
+        description=_(
+            "Separate tags by commas."))
     slug = wtforms.TextField(
         _('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."))
 
 
 class EditProfileForm(wtforms.Form):
     bio = wtforms.TextAreaField(
         _('Bio'),
-        [wtforms.validators.Length(min=0, max=500)])
+        [wtforms.validators.Length(min=0, max=500)],
+        description=_(
+            """You can use
+            <a href="http://daringfireball.net/projects/markdown/basics">
+            Markdown</a> for formatting."""))
     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.Required()],
+        description=_(
+            "Enter your old password to prove you own this account."))
+    new_password = wtforms.PasswordField(
+        _('New password'),
+        [wtforms.validators.Required(),
+         wtforms.validators.Length(min=6, max=30)],
+        id="password")
 
 
 class EditAttachmentsForm(wtforms.Form):