Merge jQuery branch, resolve conflicts

2011-12-13 15:15:57 +01:00
parent d44140a212 b27067371d
commit bb3b9e4090
13 changed files with 168 additions and 100 deletions
--- a/mediagoblin/user_pages/forms.py
+++ b/mediagoblin/user_pages/forms.py
@@ -21,7 +21,7 @@ from mediagoblin.tools.translate import fake_ugettext_passthrough as _

 class MediaCommentForm(wtforms.Form):
    comment_content = wtforms.TextAreaField(
-        _('Comment'),
+        _(''),
        [wtforms.validators.Required()])