From 650eb0534abd5feb667e31aa69882fcba1afa4a5 Mon Sep 17 00:00:00 2001 From: Mattias Andersson Date: Wed, 13 Dec 2017 19:37:34 +0100 Subject: [PATCH] Always include the hours in the the time string if the duration if (#5925) longer than one day. --- src/core/utilities.cpp | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/core/utilities.cpp b/src/core/utilities.cpp index 0e4134189..35e15c1aa 100644 --- a/src/core/utilities.cpp +++ b/src/core/utilities.cpp @@ -113,13 +113,18 @@ QString PrettyTimeNanosec(qint64 nanoseconds) { } QString WordyTime(quint64 seconds) { - quint64 days = seconds / (60 * 60 * 24); + quint64 days = seconds / (kSecsPerDay); + quint64 remaining_hours = (seconds - days * kSecsPerDay) / (60 * 60); // TODO(David Sansome): Make the plural rules translatable QStringList parts; if (days) parts << (days == 1 ? tr("1 day") : tr("%1 days").arg(days)); - parts << PrettyTime(seconds - days * 60 * 60 * 24); + + // Since PrettyTime does not return the hour if it is 0, we need to add it + // explicitly for durations longer than 1 day. + parts << (days && !remaining_hours ? QString("0:") : QString()) + + PrettyTime(seconds - days * kSecsPerDay); return parts.join(" "); }