Merge master.

Fix FAT statistics generation.
This commit is contained in:
Adarnof
2017-04-07 00:21:14 -04:00
23 changed files with 232 additions and 242 deletions

View File

@@ -100,7 +100,8 @@ def remove_timer(request, timer_id):
timer = get_object_or_404(Timer, id=timer_id)
timer.delete()
logger.debug("Deleting timer id %s by user %s" % (timer_id, request.user))
messages.success(request, _('Deleted timer in %(system)s at %(time)s.') % (timer.system, timer.eve_time))
messages.success(request, _('Deleted timer in %(system)s at %(time)s.') % {'system': timer.system,
'time': timer.eve_time})
return redirect("auth_timer_view")