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

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')])
 

mediagoblin/edit/views.py

@@ -27,6 +27,7 @@ from mediagoblin import mg_globals
 from mediagoblin.util import (
     render_to_response, redirect, clean_html, convert_to_tag_list_of_dicts,
     media_tags_as_string, cleaned_markdown_conversion)
+from mediagoblin.util import pass_to_ugettext as _
 from mediagoblin.edit import forms
 from mediagoblin.edit.lib import may_edit_media
 from mediagoblin.decorators import require_active_login, get_user_media_entry
@@ -61,7 +62,7 @@ def edit_media(request, media):
 
         if existing_user_slug_entries:
             form.slug.errors.append(
-                u'An entry with that slug already exists for this user.')
+                _(u'An entry with that slug already exists for this user.'))
         else:
             media['title'] = request.POST['title']
             media['description'] = request.POST.get('description')
@@ -90,7 +91,7 @@ def edit_media(request, media):
             and request.method != 'POST':
         messages.add_message(
             request, messages.WARNING,
-            "You are editing another user's media. Proceed with caution.")
+            _("You are editing another user's media. Proceed with caution."))
 
     return render_to_response(
         request,
@@ -161,7 +162,7 @@ def edit_profile(request):
         if request.method != 'POST':
             messages.add_message(
                 request, messages.WARNING,
-                "You are editing a user's profile. Proceed with caution.")
+                _("You are editing a user's profile. Proceed with caution."))
     else:
         user = request.user