Fix date time format for compilation string

BearWare · Dec 24, 2024 · 3435ee7 · 3435ee7
1 parent b08ad51
commit 3435ee7
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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");