mirrors/nextcloud-desktop
1
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2024-11-21 20:45:51 +03:00
Code Issues Projects Releases Packages Wiki Activity

use a more compact format to display date of activities

Browse source 
Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
This commit is contained in:
Matthieu Gallien 2023-05-17 15:30:51 +02:00
parent ddeb629157
commit 9dd5cc35f8
No known key found for this signature in database
GPG key ID: 7D0F74F05C22F553
1 changed files with 5 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/common/utility.cpp
View file

@ -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));
}
}
}