Funkwhale/Clementine-audio-player-Mac-Linux-Windows
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Always include the hours in the the time string if the duration if (#5925)

Browse Source 
longer than one day.
This commit is contained in:
Mattias Andersson 2017-12-13 19:37:34 +01:00 committed by John Maguire
parent 27bef68cf6
commit 650eb0534a
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/core/utilities.cpp
View File

@ -113,13 +113,18 @@ QString PrettyTimeNanosec(qint64 nanoseconds) {
} }
QString WordyTime(quint64 seconds) { 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 // TODO(David Sansome): Make the plural rules translatable
QStringList parts; QStringList parts;
if (days) parts << (days == 1 ? tr("1 day") : tr("%1 days").arg(days)); 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(" "); return parts.join(" ");
} }