fixed bugs in away() function when building duration for popup.

This commit is contained in:
Alan Hamlett 2013-07-11 23:35:49 -07:00
parent 64f95e28f0
commit 6b7eadb30e
1 changed files with 16 additions and 11 deletions

View File

@ -71,19 +71,24 @@ def api(targetFile, timestamp, isWrite=False, endtime=None):
def away(now): def away(now):
duration = now - LAST_USAGE duration = now - LAST_USAGE
units = 'seconds' minutes = ''
if duration > 59: units = 'second'
if duration >= 60:
duration = int(duration / 60) duration = int(duration / 60)
units = 'minutes' units = 'minute'
if duration > 59: if duration >= 60:
duration = int(duration / 60) remainder = duration % 60
units = 'hours' if remainder > 0:
if duration > 24: minutes = ' and %d minute' % remainder
duration = int(duration / 24) if remainder > 1:
units = 'days' minutes = minutes + 's'
duration = int(duration / 60)
units = 'hour'
if duration > 1:
units = units + 's'
return sublime\ return sublime\
.ok_cancel_dialog("You were away %d %s. Add time to current file?"\ .ok_cancel_dialog("You were away %d %s%s. Add time to current file?"\
% (duration, units), 'Yes, log this time') % (duration, units, minutes), 'Yes, log this time')
def enough_time_passed(now): def enough_time_passed(now):