File 2001-time-format.patch of Package kf6-kio

diff --git a/src/core/job_error.cpp b/src/core/job_error.cpp
index 7bfe19b761f3b56d7f991ba17cf6303e13cec610..128a4d875053fd475762660deb0be11b3f0cb7c8 100644
--- a/src/core/job_error.cpp
+++ b/src/core/job_error.cpp
@@ -6,6 +6,9 @@
 */
 
 #include "job.h"
+
+#include "../utils_p.h"
+
 #include <KLocalizedString>
 #include <KStringHandler>
 #include <kprotocolmanager.h>
@@ -295,7 +298,7 @@ QStringList KIO::Job::detailedErrorStrings(const QUrl *reqUrl /*= 0*/, int metho
         url = i18nc("@info url", "(unknown)");
     }
 
-    datetime = QLocale().toString(QDateTime::currentDateTime(), QLocale::LongFormat);
+    datetime = Utils::toString(QDateTime::currentDateTime());
 
     ret << errorName;
     ret << i18nc("@info %1 error name, %2 description", "<qt><p><b>%1</b></p><p>%2</p></qt>", errorName, description);
@@ -361,7 +364,7 @@ KIOCORE_EXPORT QByteArray KIO::rawErrorDetail(int errorCode, const QString &erro
         protocol = i18nc("@info protocol", "(unknown)");
     }
 
-    datetime = QLocale().toString(QDateTime::currentDateTime(), QLocale::LongFormat);
+    datetime = Utils::toString(QDateTime::currentDateTime());
 
     QString errorName;
     QString techName;
diff --git a/src/core/kfileitem.cpp b/src/core/kfileitem.cpp
index 43aeb8e160d16410e0747d248e7b33ced5d84be9..ddf4e2c5febf6adf39e0840272c08b0219a8e8b9 100644
--- a/src/core/kfileitem.cpp
+++ b/src/core/kfileitem.cpp
@@ -1581,7 +1581,7 @@ QString KFileItem::timeString(FileTimes which) const
         return QString();
     }
 
-    return QLocale::system().toString(d->time(which), QLocale::LongFormat);
+    return Utils::toString(d->time(which), QLocale::system());
 }
 
 QUrl KFileItem::mostLocalUrl(bool *local) const
diff --git a/src/utils_p.h b/src/utils_p.h
index 1a7be043f24ed20b9edf052d024735ea4d5e9a51..0c315fcb8b591099de73f2d15b1a83a5efcf34d3 100644
--- a/src/utils_p.h
+++ b/src/utils_p.h
@@ -172,6 +172,16 @@ inline bool isLinkMask(mode_t mode)
     return (mode & QT_STAT_MASK) == QT_STAT_LNK;
 }
 
+inline QString toString(const QDateTime &dateTime, const QLocale &locale = QLocale())
+{
+    return locale.toString(dateTime, locale.dateTimeFormat().remove(QLatin1String(" tttt")));
+}
+
+inline QString toString(const QTime &time, const QLocale &locale = QLocale())
+{
+    return locale.toString(time, locale.timeFormat().remove(QLatin1String(" tttt")));
+}
+
 } // namespace
 
 #endif // KIO_UTILS_P_H
diff --git a/src/widgets/kpropertiesdialogbuiltin_p.cpp b/src/widgets/kpropertiesdialogbuiltin_p.cpp
index 2938bdf137715c39731906451a6ab80e2584a9d6..f80e0f7965f58f14ddf08c7d705a7ac3ec323b60 100644
--- a/src/widgets/kpropertiesdialogbuiltin_p.cpp
+++ b/src/widgets/kpropertiesdialogbuiltin_p.cpp
@@ -463,23 +463,22 @@ KFilePropsPlugin::KFilePropsPlugin(KPropertiesDialog *_props)
 
     // Time widgets
     if (!d->bMultiple) {
-        QLocale locale;
         if (const QDateTime dt = firstItem.time(KFileItem::CreationTime); !dt.isNull()) {
-            d->m_ui->createdTimeLabel->setText(locale.toString(dt, QLocale::LongFormat));
+            d->m_ui->createdTimeLabel->setText(Utils::toString(dt));
         } else {
             d->m_ui->createdTimeLabel->hide();
             d->m_ui->createdTimeLabel_Left->hide();
         }
 
         if (const QDateTime dt = firstItem.time(KFileItem::ModificationTime); !dt.isNull()) {
-            d->m_ui->modifiedTimeLabel->setText(locale.toString(dt, QLocale::LongFormat));
+            d->m_ui->modifiedTimeLabel->setText(Utils::toString(dt));
         } else {
             d->m_ui->modifiedTimeLabel->hide();
             d->m_ui->modifiedTimeLabel_Left->hide();
         }
 
         if (const QDateTime dt = firstItem.time(KFileItem::AccessTime); !dt.isNull()) {
-            d->m_ui->accessTimeLabel->setText(locale.toString(dt, QLocale::LongFormat));
+            d->m_ui->accessTimeLabel->setText(Utils::toString(dt));
         } else {
             d->m_ui->accessTimeLabel->hide();
             d->m_ui->accessTimeLabel_Left->hide();
@@ -527,7 +526,6 @@ KFilePropsPlugin::KFilePropsPlugin(KPropertiesDialog *_props)
         KSeparator *sep = new KSeparator(Qt::Horizontal, &d->m_mainWidget);
         d->m_ui->gridLayout->addWidget(sep, curRow++, 0, 1, 3);
 
-        QLocale locale;
         for (int i = 0; i < extraFields.count(); ++i) {
             const auto &field = extraFields.at(i);
 
@@ -542,7 +540,7 @@ KFilePropsPlugin::KFilePropsPlugin(KPropertiesDialog *_props)
                     continue;
                 }
 
-                text = locale.toString(date, QLocale::LongFormat);
+                text = Utils::toString(date);
             }
 
             auto *label = new QLabel(i18n("%1:", field.name), &d->m_mainWidget);