From a1ff962d1d9f40bfd9351532188b587974c8043e Mon Sep 17 00:00:00 2001 From: Christophe Deschamps Date: Thu, 10 Oct 2024 16:20:53 +0200 Subject: [PATCH] Call history date formatting adjustments (today, yesterday, etc ...) --- Linphone/tool/Utils.cpp | 9 +++++++-- Linphone/view/Page/Main/Call/CallPage.qml | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/Linphone/tool/Utils.cpp b/Linphone/tool/Utils.cpp index b2795b9f2..13a1f2702 100644 --- a/Linphone/tool/Utils.cpp +++ b/Linphone/tool/Utils.cpp @@ -259,8 +259,13 @@ QString Utils::formatElapsedTime(int seconds, bool dotsSeparator) { } QString Utils::formatDate(const QDateTime &date, bool includeTime) { - QString format = date.date().year() == QDateTime::currentDateTime().date().year() ? "dd MMMM" : "dd MMMM yyyy"; - auto dateDay = tr(date.date().toString(format).toLocal8Bit().data()); + QString dateDay; + if (date.date() == QDate::currentDate()) dateDay = tr("Aujourd'hui"); + else if (date.date() == QDate::currentDate().addDays(-1)) dateDay = tr("Hier"); + else { + QString format = date.date().year() == QDateTime::currentDateTime().date().year() ? "dd MMMM" : "dd MMMM yyyy"; + auto dateDay = tr(date.date().toString(format).toLocal8Bit().data()); + } if (!includeTime) return dateDay; auto time = date.time().toString("hh:mm"); diff --git a/Linphone/view/Page/Main/Call/CallPage.qml b/Linphone/view/Page/Main/Call/CallPage.qml index 036ebe1d3..0320c170c 100644 --- a/Linphone/view/Page/Main/Call/CallPage.qml +++ b/Linphone/view/Page/Main/Call/CallPage.qml @@ -347,7 +347,7 @@ AbstractMainPage { } Text { // text: modelData.core.date - text: UtilsCpp.formatDateElapsedTime(modelData.core.date) + text: UtilsCpp.formatDate(modelData.core.date, true) font { pixelSize: 12 * DefaultStyle.dp weight: 300 * DefaultStyle.dp