diff options
| author | Brandon Invergo <brandon@invergo.net> | 2013-05-19 13:23:17 +0200 |
|---|---|---|
| committer | Brandon Invergo <brandon@invergo.net> | 2013-05-19 13:23:17 +0200 |
| commit | e02b7b6b3bd6b20c65aeb2ca5fd1e0030b631b88 (patch) | |
| tree | 988b9505a649f824f2ea53ac04bdfbc3a0da983a /mediagoblin/user_pages/forms.py | |
| parent | 60c42337ef7bc9b4aec0d3f1b2cb5f19a09d9a7f (diff) | |
| parent | 041d2fd785f9b3e18f9fd758f91dbfa7715d317c (diff) | |
| download | mediagoblin-e02b7b6b3bd6b20c65aeb2ca5fd1e0030b631b88.tar.lz mediagoblin-e02b7b6b3bd6b20c65aeb2ca5fd1e0030b631b88.tar.xz mediagoblin-e02b7b6b3bd6b20c65aeb2ca5fd1e0030b631b88.zip | |
Merge branch 'master' of git://gitorious.org/mediagoblin/mediagoblin
Diffstat (limited to 'mediagoblin/user_pages/forms.py')
| -rw-r--r-- | mediagoblin/user_pages/forms.py | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/mediagoblin/user_pages/forms.py b/mediagoblin/user_pages/forms.py index 9e8ccf01..9a193680 100644 --- a/mediagoblin/user_pages/forms.py +++ b/mediagoblin/user_pages/forms.py @@ -16,12 +16,15 @@ import wtforms from wtforms.ext.sqlalchemy.fields import QuerySelectField -from mediagoblin.tools.translate import fake_ugettext_passthrough as _ +from mediagoblin.tools.translate import lazy_pass_to_ugettext 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()],) |