From: Christopher Allan Webber <cwebber@dustycloud.org>
Date: Thu, 11 Aug 2011 00:53:37 +0000 (-0500)
Subject: Merge branch 'master' into processing
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=852d5bb2387706c11925fa0c2abe4a1f34708f16;p=mediagoblin.git

Merge branch 'master' into processing
---

852d5bb2387706c11925fa0c2abe4a1f34708f16
diff --cc mediagoblin/submit/views.py
index f19bf22e,ba13b755..59d8fe3f
--- a/mediagoblin/submit/views.py
+++ b/mediagoblin/submit/views.py
@@@ -84,10 -91,9 +91,10 @@@ def submit_start(request)
              entry.save(validate=True)
  
              # queue it for processing
 -            process_media_initial.delay(unicode(entry['_id']))
 +            result = process_media_initial.delay(unicode(entry['_id']))
 +            entry['queued_task_id'] = result.task_id
  
-             add_message(request, SUCCESS, 'Woohoo! Submitted!')
+             add_message(request, SUCCESS, _('Woohoo! Submitted!'))
  
              return redirect(request, "mediagoblin.user_pages.user_home",
                              user = request.user['username'])