[Pkg-owncloud-commits] [owncloud-client] 88/159: ProtocolWidget: Fix adding of seconds. #2535

[Sandro Knauß]

This is an automated email from the git hooks/post-receive script.

hefee-guest pushed a commit to branch master
in repository owncloud-client.

commit 9d8fc4aa4d1a69a95909ebeed0a903353baa02f0
Author: Christian Kamm <kamm at incasoftware.de>
Date:   Fri Apr 10 12:11:35 2015 +0200

    ProtocolWidget: Fix adding of seconds. #2535
---
 src/gui/protocolwidget.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/gui/protocolwidget.cpp b/src/gui/protocolwidget.cpp
index d4b6c2b..85e3f41 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);
 }
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud-client.git