From 3435ee7536ef29c56ccc80e1a080de48440a3ad8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Corentin=20BACQU=C3=89-CAZENAVE?= Date: Mon, 2 Dec 2024 13:28:55 +0100 Subject: [PATCH] Fix date time format for compilation string --- Client/qtTeamTalk/aboutdlg.cpp | 2 +- Client/qtTeamTalk/utilui.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Client/qtTeamTalk/aboutdlg.cpp b/Client/qtTeamTalk/aboutdlg.cpp index 78f1ea76a..35ac22df4 100644 --- a/Client/qtTeamTalk/aboutdlg.cpp +++ b/Client/qtTeamTalk/aboutdlg.cpp @@ -28,7 +28,7 @@ AboutDlg::AboutDlg(QWidget* parent) ui.setupUi(this); setWindowIcon(QIcon(APPICON)); QString dateTimeString = QString("%1 %2").arg(__DATE__).arg(__TIME__); - QString compile = QString(tr("Compiled on %1 using Qt %2 (Qt %3 used by this instance).")).arg(getFormattedDateTime(dateTimeString, "MMM dd yyyy HH:mm:ss")).arg(QT_VERSION_STR).arg(qVersion()) + "\r\n" + + QString compile = QString(tr("Compiled on %1 using Qt %2 (Qt %3 used by this instance).")).arg(getFormattedDateTime(dateTimeString, "MMM d yyyy HH:mm:ss")).arg(QT_VERSION_STR).arg(qVersion()) + "\r\n" + tr("Version ") + (TEAMTALK_VERSION ".\r\n"); if(sizeof(void*) == 8) compile += QString(tr("TeamTalk 64-bit DLL version %1.")).arg(_Q(TT_GetVersion())); diff --git a/Client/qtTeamTalk/utilui.cpp b/Client/qtTeamTalk/utilui.cpp index 649c464cf..d6401c20e 100644 --- a/Client/qtTeamTalk/utilui.cpp +++ b/Client/qtTeamTalk/utilui.cpp @@ -485,7 +485,7 @@ QString getLanguageDisplayName(const QString &languageCode) QString getFormattedDateTime(QString originalDateTimeString, QString inputFormat) { - QDateTime originalDateTime = QDateTime::fromString(originalDateTimeString, inputFormat); + QDateTime originalDateTime = QDateTime::fromString(originalDateTimeString.simplified(), inputFormat); if (!originalDateTime.isValid()) { return QString("Invalid DateTime");