From 9dd5cc35f8f38f0ec01db4433a0e2c3072f46d90 Mon Sep 17 00:00:00 2001 From: Matthieu Gallien Date: Wed, 17 May 2023 15:30:51 +0200 Subject: [PATCH] use a more compact format to display date of activities Signed-off-by: Matthieu Gallien --- src/common/utility.cpp | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/src/common/utility.cpp b/src/common/utility.cpp index da968e53f..07715924e 100644 --- a/src/common/utility.cpp +++ b/src/common/utility.cpp @@ -478,10 +478,8 @@ QString Utility::timeAgoInWords(const QDateTime &dt, const QDateTime &from) now = from; } - if (dt.daysTo(now) == 1) { - return QObject::tr("%n day ago", "", dt.daysTo(now)); - } else if (dt.daysTo(now) > 1) { - return QObject::tr("%n days ago", "", dt.daysTo(now)); + if (dt.daysTo(now) >= 1) { + return QObject::tr("%nd", "delay in days after an activity", dt.daysTo(now)); } else { qint64 secs = dt.secsTo(now); if (secs < 0) { @@ -490,11 +488,7 @@ QString Utility::timeAgoInWords(const QDateTime &dt, const QDateTime &from) if (floor(secs / 3600.0) > 0) { int hours = floor(secs / 3600.0); - if (hours == 1) { - return (QObject::tr("%n hour ago", "", hours)); - } else { - return (QObject::tr("%n hours ago", "", hours)); - } + return (QObject::tr("%nh", "delay in hours after an activity", hours)); } else { int minutes = qRound(secs / 60.0); @@ -502,13 +496,10 @@ QString Utility::timeAgoInWords(const QDateTime &dt, const QDateTime &from) if (secs < 5) { return QObject::tr("now"); } else { - return QObject::tr("Less than a minute ago"); + return QObject::tr("1m", "one minute after activity date and time"); } - - } else if (minutes == 1) { - return (QObject::tr("%n minute ago", "", minutes)); } else { - return (QObject::tr("%n minutes ago", "", minutes)); + return (QObject::tr("%nm", "delay in minutes after an activity", minutes)); } } } -- 2.30.2