3 files changed, 25 insertions, 26 deletions
diff --git a/mediagoblin/submit/forms.py b/mediagoblin/submit/forms.py
index bd1e904f..e9bd93fd 100644
--- a/mediagoblin/submit/forms.py
+++ b/mediagoblin/submit/forms.py
@@ -18,7 +18,7 @@
 import wtforms
 
 from mediagoblin.tools.text import tag_length_validator
-from mediagoblin.tools.translate import fake_ugettext_passthrough as _
+from mediagoblin.tools.translate import lazy_pass_to_ugettext as _
 from mediagoblin.tools.licenses import licenses_as_choices
 
 
diff --git a/mediagoblin/submit/lib.py b/mediagoblin/submit/lib.py
index a5483471..7c3b8ab3 100644
--- a/mediagoblin/submit/lib.py
+++ b/mediagoblin/submit/lib.py
@@ -40,7 +40,7 @@ def prepare_queue_task(app, entry, filename):
     """
     Prepare a MediaEntry for the processing queue and get a queue file
     """
-    # We generate this ourselves so we know what the taks id is for
+    # We generate this ourselves so we know what the task id is for
     # retrieval later.
 
     # (If we got it off the task's auto-generation, there'd be
diff --git a/mediagoblin/submit/views.py b/mediagoblin/submit/views.py
index 9d31c844..e964ec12 100644
--- a/mediagoblin/submit/views.py
+++ b/mediagoblin/submit/views.py
@@ -114,6 +114,7 @@ def submit_start(request):
         {'submit_form': submit_form,
          'app_config': mg_globals.app_config})
 
+
 @require_active_login
 def add_collection(request, media=None):
     """
@@ -122,32 +123,30 @@ def add_collection(request, media=None):
     submit_form = submit_forms.AddCollectionForm(request.form)
 
     if request.method == 'POST' and submit_form.validate():
-        try:
-            collection = request.db.Collection()
-
-            collection.title = unicode(submit_form.title.data)
-            collection.description = unicode(submit_form.description.data)
-            collection.creator = request.user.id
-            collection.generate_slug()
-
-            # Make sure this user isn't duplicating an existing collection
-            existing_collection = request.db.Collection.find_one({
-                    'creator': request.user.id,
-                    'title':collection.title})
-
-            if existing_collection:
-                messages.add_message(
-                    request, messages.ERROR, _('You already have a collection called "%s"!' % collection.title))
-            else:
-                collection.save()
-
-                add_message(request, SUCCESS, _('Collection "%s" added!' % collection.title))
+        collection = request.db.Collection()
+
+        collection.title = unicode(submit_form.title.data)
+        collection.description = unicode(submit_form.description.data)
+        collection.creator = request.user.id
+        collection.generate_slug()
+
+        # Make sure this user isn't duplicating an existing collection
+        existing_collection = request.db.Collection.find_one({
+                'creator': request.user.id,
+                'title':collection.title})
+
+        if existing_collection:
+            add_message(request, messages.ERROR,
+                _('You already have a collection called "%s"!') \
+                    % collection.title)
+        else:
+            collection.save()
 
-            return redirect(request, "mediagoblin.user_pages.user_home",
-                            user=request.user.username)
+            add_message(request, SUCCESS,
+                _('Collection "%s" added!') % collection.title)
 
-        except Exception as e:
-            raise
+        return redirect(request, "mediagoblin.user_pages.user_home",
+                        user=request.user.username)
 
     return render_to_response(
         request,