From c72a98908591485dfdf4e00dedffaa904d4363a4 Mon Sep 17 00:00:00 2001 From: Christophe Deschamps Date: Wed, 28 May 2025 10:01:31 +0200 Subject: [PATCH] Fix ephemeral times formatting function --- Linphone/core/chat/message/EventLogCore.cpp | 12 ++++++------ Linphone/data/languages/en.ts | 7 +++++++ 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/Linphone/core/chat/message/EventLogCore.cpp b/Linphone/core/chat/message/EventLogCore.cpp index 45906bca8..5539942da 100644 --- a/Linphone/core/chat/message/EventLogCore.cpp +++ b/Linphone/core/chat/message/EventLogCore.cpp @@ -139,10 +139,10 @@ void EventLogCore::computeEvent(const std::shared_ptr } QString EventLogCore::getEphemeralFormatedTime(int selectedTime) { - if (selectedTime == 60) mEventDetails = tr("nMinute", "", 1).arg(1); - else if (selectedTime == 3600) mEventDetails = tr("nHour", "", 1).arg(1); - else if (selectedTime == 86400) mEventDetails = tr("nDay", "", 1).arg(1); - else if (selectedTime == 259200) mEventDetails = tr("nDay", "", 3).arg(3); - else if (selectedTime == 604800) mEventDetails = tr("nWeek", "", 1).arg(1); - else return ""; + if (selectedTime == 60) return tr("nMinute", "", 1).arg(1); + else if (selectedTime == 3600) return tr("nHour", "", 1).arg(1); + else if (selectedTime == 86400) return tr("nDay", "", 1).arg(1); + else if (selectedTime == 259200) return tr("nDay", "", 3).arg(3); + else if (selectedTime == 604800) return tr("nWeek", "", 1).arg(1); + else return tr("nSeconds", "", selectedTime).arg(selectedTime); } diff --git a/Linphone/data/languages/en.ts b/Linphone/data/languages/en.ts index e6914419c..76939785a 100644 --- a/Linphone/data/languages/en.ts +++ b/Linphone/data/languages/en.ts @@ -5978,6 +5978,13 @@ Failed to create 1-1 conversation with %1 ! 'Ephemeral messages have been updated: %1' : Little message to show on the event when ephemeral has been updated. %1 is a date time Ephemeral messages have been updated: %1 + + nSeconds + + %1 second + %1 seconds + + nMinute