655: Fix collection fetching for media_collect()

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

diff --git a/mediagoblin/user_pages/forms.py b/mediagoblin/user_pages/forms.py
index 9e8ccf01e65d93678ad7767bea1cfd81e6354c66..e9746a6caa1aa88e7f466edb28c49f0fdae0bd89 100644 (file)
--- a/mediagoblin/user_pages/forms.py
+++ b/mediagoblin/user_pages/forms.py
@@ -20,8 +20,11 @@ from mediagoblin.tools.translate import fake_ugettext_passthrough as _
 
 class MediaCommentForm(wtforms.Form):
     comment_content = wtforms.TextAreaField(
-        '',
-        [wtforms.validators.Required()])
+        _('Comment'),
+        [wtforms.validators.Required()],
+        description=_(u'You can use '
+                      u'<a href="http://daringfireball.net/projects/markdown/basics">'
+                      u'Markdown</a> for formatting.'))
 
 class ConfirmDeleteForm(wtforms.Form):
     confirm = wtforms.BooleanField(
@@ -32,7 +35,9 @@ class ConfirmCollectionItemRemoveForm(wtforms.Form):
         _('I am sure I want to remove this item from the collection'))
 
 class MediaCollectForm(wtforms.Form):
-    collection = QuerySelectField(allow_blank=True, blank_text=_('-- Select --'), get_label='title',)
+    collection = QuerySelectField(
+        _('Collection'),
+        allow_blank=True, blank_text=_('-- Select --'), get_label='title',)
     note = wtforms.TextAreaField(
         _('Include a note'),
         [wtforms.validators.Optional()],)