Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/owncloud/client.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorChristian Kamm <kamm@incasoftware.de>2015-04-10 13:11:35 +0300
committerChristian Kamm <kamm@incasoftware.de>2015-04-10 13:11:35 +0300
commit9d8fc4aa4d1a69a95909ebeed0a903353baa02f0 (patch)
tree7cb68c44feb8fa7003193dda800dee75632491a9 /src
parent57ac1d9ea2688d3f362b23b0e8bfb0e2b19ac7b4 (diff)
ProtocolWidget: Fix adding of seconds. #2535
Diffstat (limited to 'src')
-rw-r--r--src/gui/protocolwidget.cpp4
1 files changed, 2 insertions, 2 deletions
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);
}