Skip to content

Commit

Permalink
slight syntax changes
Browse files Browse the repository at this point in the history
  • Loading branch information
sravfeyn committed Jul 10, 2013
1 parent 3737780 commit 3cfdcea
Showing 1 changed file with 7 additions and 7 deletions.
14 changes: 7 additions & 7 deletions corehq/apps/fixtures/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -320,16 +320,16 @@ def error_redirect():
upload_result = run_upload(request, self.domain, workbook)
if upload_result["unknown_groups"]:
for group_name in upload_result["unknown_groups"]:
messages.error(request, _("Unknown group: '%(name)s'" % {'name': group_name}))
messages.error(request, _("Unknown group: '%(name)s'") % {'name': group_name})
if upload_result["unknown_users"]:
for user_name in upload_result["unknown_users"]:
messages.error(request, _("Unknown user: '%(name)s'" % {'name': user_name}))
messages.error(request, _("Unknown user: '%(name)s'") % {'name': user_name})
except WorksheetNotFound as e:
messages.error(request, _("Workbook does not contain a sheet called '%(title)s'" % {'title': e.title}))
messages.error(request, _("Workbook does not contain a sheet called '%(title)s'") % {'title': e.title})
return error_redirect()
except Exception as e:
notify_exception(request)
messages.error(request, _("Fixture upload could not complete due to the following error: '%(e)s'" % {'e': e}))
messages.error(request, _("Fixture upload could not complete due to the following error: '%(e)s'") % {'e': e})
return error_redirect()

return HttpResponseRedirect(reverse('fixture_view', args=[self.domain]))
Expand Down Expand Up @@ -488,19 +488,19 @@ def _get_or_raise(container, attr):
if group:
old_data_item.add_group(group, transaction=transaction)
else:
messages.error(request, _("Unknown group: '%(name)s'. But the row is successfully added" % {'name': group_name}))
messages.error(request, _("Unknown group: '%(name)s'. But the row is successfully added") % {'name': group_name})

for raw_username in di.get('user', []):
try:
username = normalize_username(raw_username, domain)
except ValidationError:
messages.error(request, _("Invalid username: '%(name)s'. Row is not added" % {'name': raw_username}))
messages.error(request, _("Invalid username: '%(name)s'. Row is not added") % {'name': raw_username})
continue
user = CommCareUser.get_by_username(username)
if user:
old_data_item.add_user(user)
else:
messages.error(request, _("Unknown user: '%(name)s'. But the row is successfully added" % {'name': raw_username}))
messages.error(request, _("Unknown user: '%(name)s'. But the row is successfully added") % {'name': raw_username})

return_val["number_of_fixtures"] = number_of_fixtures + 1
return return_val

0 comments on commit 3cfdcea

Please sign in to comment.