From: Christian Kamm <kamm@incasoftware.de>
Date: Fri, 10 Apr 2015 10:11:35 +0000 (+0200)
Subject: ProtocolWidget: Fix adding of seconds. #2535
X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~1803^2~210
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=9d8fc4aa4d1a69a95909ebeed0a903353baa02f0;p=nextcloud-desktop.git

ProtocolWidget: Fix adding of seconds. #2535
---

diff --git a/src/gui/protocolwidget.cpp b/src/gui/protocolwidget.cpp
index d4b6c2bfa..85e3f4102 100644
--- a/src/gui/protocolwidget.cpp
+++ b/src/gui/protocolwidget.cpp
@@ -169,8 +169,8 @@ QString ProtocolWidget::timeString(QDateTime dt, QLocale::FormatType format) con
 {
     const QLocale loc = QLocale::system();
     QString dtFormat = loc.dateTimeFormat(format);
-    static const QRegExp re("HH:mm(?!:ss)");
-    dtFormat.replace(re, "HH:mm:ss");
+    static const QRegExp re("(HH|H|hh|h):mm(?!:s)");
+    dtFormat.replace(re, "\\1:mm:ss");
     return loc.toString(dt, dtFormat);
 }