heckyel/mediagoblin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix translations for collections and drop useless try.

Browse Source 
Don't do:  _("With some value: %s" % value)
Please do: _("WIth some value: %s") % value

Fixed for collection messages.

Also removed a
  try:
    some_code.
  except Exception as e:
    raise

No point in doing that.

Fixing the indentation of some_code comes in an extra
commit, because changing indentation is annoying enough
alone, so don't mix it with other changes.
This commit is contained in:
Elrond 2013-04-27 14:52:08 +02:00
parent 90e7fc6738
commit 2041ceae1f
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
mediagoblin/submit/views.py
View File

@ -114,6 +114,7 @@ def submit_start(request):
{'submit_form': submit_form, {'submit_form': submit_form,
'app_config': mg_globals.app_config}) 'app_config': mg_globals.app_config})
@require_active_login @require_active_login
def add_collection(request, media=None): def add_collection(request, media=None):
""" """
@ -122,7 +123,6 @@ def add_collection(request, media=None):
submit_form = submit_forms.AddCollectionForm(request.form) submit_form = submit_forms.AddCollectionForm(request.form)
if request.method == 'POST' and submit_form.validate(): if request.method == 'POST' and submit_form.validate():
try:
collection = request.db.Collection() collection = request.db.Collection()
collection.title = unicode(submit_form.title.data) collection.title = unicode(submit_form.title.data)
@ -136,19 +136,18 @@ def add_collection(request, media=None):
'title':collection.title}) 'title':collection.title})
if existing_collection: if existing_collection:
messages.add_message( add_message(request, messages.ERROR,
request, messages.ERROR, _('You already have a collection called "%s"!' % collection.title)) _('You already have a collection called "%s"!') \
% collection.title)
else: else:
collection.save() collection.save()
add_message(request, SUCCESS, _('Collection "%s" added!' % collection.title)) add_message(request, SUCCESS,
_('Collection "%s" added!') % collection.title)
return redirect(request, "mediagoblin.user_pages.user_home", return redirect(request, "mediagoblin.user_pages.user_home",
user=request.user.username) user=request.user.username)
except Exception as e:
raise
return render_to_response( return render_to_response(
request, request,
'mediagoblin/submit/collection.html', 'mediagoblin/submit/collection.html',

4
mediagoblin/user_pages/views.py
View File

@ -409,8 +409,8 @@ def collection_confirm_delete(request, collection):
item.delete() item.delete()
collection.delete() collection.delete()
messages.add_message( messages.add_message(request, messages.SUCCESS,
request, messages.SUCCESS, _('You deleted the collection "%s"' % collection_title)) _('You deleted the collection "%s"') % collection_title)
return redirect(request, "mediagoblin.user_pages.user_home", return redirect(request, "mediagoblin.user_pages.user_home",
user=username) user=username)