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

diff --git a/src/windows/leash/LeashView.cpp b/src/windows/leash/LeashView.cpp
index 298bee76cfda8d4d64dd59c09ab6030499b58bf4..ceac1c411792b3b6da4997a72f6b94ec57336665 100644 (file)
--- 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);