diff options
author | Kevin Wasserman <kevin.wasserman@painless-security.com> | 2012-06-27 21:46:04 -0400 |
---|---|---|
committer | Ben Kaduk <kaduk@mit.edu> | 2012-08-24 16:58:45 -0400 |
commit | d3bad500077b597b28864abdbe003dbb99ffcc90 (patch) | |
tree | 22b5a0f306a5ddd7b5bd096e766c93f1171fdcbd /src/windows/leash | |
parent | 4ae7790a9be2b7c5534362381f9cf932ae96ff29 (diff) | |
download | krb5-d3bad500077b597b28864abdbe003dbb99ffcc90.tar.gz krb5-d3bad500077b597b28864abdbe003dbb99ffcc90.tar.xz krb5-d3bad500077b597b28864abdbe003dbb99ffcc90.zip |
KfW GUI -- abbreviate durations
Map days -> d; hours -> h; minutes -> m
Signed-off-by: Kevin Wasserman <kevin.wasserman@painless-security.com>
ticket: 7285 (new)
queue: kfw
target_version: 1.10.4
tags: pullup
Diffstat (limited to 'src/windows/leash')
-rw-r--r-- | src/windows/leash/LeashView.cpp | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/src/windows/leash/LeashView.cpp b/src/windows/leash/LeashView.cpp index 298bee76cf..ceac1c4117 100644 --- a/src/windows/leash/LeashView.cpp +++ b/src/windows/leash/LeashView.cpp @@ -309,25 +309,15 @@ void DurationToString(long delta, LPTSTR *outStr) delta -= hours * SECONDS_PER_HOUR; minutes = delta / SECONDS_PER_MINUTE; - if (minutes != 1) - _snprintf(minutesStr, MAX_DURATION_STR, "%d minutes", minutes); - else - _snprintf(minutesStr, MAX_DURATION_STR, "1 minute"); + _snprintf(minutesStr, MAX_DURATION_STR, "%d m", minutes); minutesStr[MAX_DURATION_STR] = 0; - if (hours != 1) - _snprintf(hoursStr, MAX_DURATION_STR, "%d hours", hours); - else - _snprintf(hoursStr, MAX_DURATION_STR, "1 hour"); + _snprintf(hoursStr, MAX_DURATION_STR, "%d h", hours); hoursStr[MAX_DURATION_STR] = 0; if (days > 0) { - if (days > 1) - _snprintf(*outStr, MAX_DURATION_STR, "(%d days, %s remaining)", - days, hoursStr); - else - _snprintf(*outStr, MAX_DURATION_STR, "(1 day, %s remaining)", - hoursStr); + _snprintf(*outStr, MAX_DURATION_STR, "(%d d, %s remaining)", days, + hoursStr); } else if (hours > 0) { _snprintf(*outStr, MAX_DURATION_STR, "(%s, %s remaining)", hoursStr, minutesStr); |