Merge branch 'master' into jwandborg-f482_media_attachments

Conflicts:
	mediagoblin/config_spec.ini
	mediagoblin/edit/forms.py
	mediagoblin/edit/views.py
	mediagoblin/submit/views.py
	mediagoblin/templates/mediagoblin/user_pages/media.html

1 files changed, 9 insertions, 6 deletions

diff --git a/mediagoblin/edit/forms.py b/mediagoblin/edit/forms.py
index 3969e509..c5ab9fd9 100644
--- a/mediagoblin/edit/forms.py
+++ b/mediagoblin/edit/forms.py
@@ -16,26 +16,29 @@
 
 
 import wtforms
+
 from mediagoblin.util import tag_length_validator, TOO_LONG_TAG_WARNING
+from mediagoblin.util import fake_ugettext_passthrough as _
 
 
 class EditForm(wtforms.Form):
     title = wtforms.TextField(
-        'Title',
+        _('Title'),
         [wtforms.validators.Length(min=0, max=500)])
     slug = wtforms.TextField(
-        'Slug',
-        [wtforms.validators.Required(message="The slug can't be empty")])
+        _('Slug'),
+        [wtforms.validators.Required(message=_("The slug can't be empty"))])
     description = wtforms.TextAreaField('Description of this work')
     tags = wtforms.TextField(
-        'Tags',
+        _('Tags'),
         [tag_length_validator])
 
 class EditProfileForm(wtforms.Form):
-    bio = wtforms.TextAreaField('Bio',
+    bio = wtforms.TextAreaField(
+        _('Bio'),
         [wtforms.validators.Length(min=0, max=500)])
     url = wtforms.TextField(
-        'Website',
+        _('Website'),
         [wtforms.validators.Optional(),
          wtforms.validators.URL(message='Improperly formed URL')])