[SCM] ktp-text-ui packaging branch, master, updated. debian/15.12.1-1-1918-gdf4b0ec

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-text-ui.git;a=commitdiff;h=3425f7b

The following commit has been merged in the master branch:
commit 3425f7bde96251a2d88730df31f289bd1b1619c1
Author: Daniele E. Domenichelli <daniele.domenichelli at gmail.com>
Date:   Tue Feb 28 09:57:11 2012 +0100

    Fix time format for some themes
---
 lib/adium-theme-view.cpp | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/lib/adium-theme-view.cpp b/lib/adium-theme-view.cpp
index 7a45882..d5be307 100644
--- a/lib/adium-theme-view.cpp
+++ b/lib/adium-theme-view.cpp
@@ -509,7 +509,14 @@ void AdiumThemeView::appendNextMessage(QString &html)
 //taken from Kopete code
 QString AdiumThemeView::formatTime(const QString &timeFormat, const QDateTime &dateTime)
 {
-    return dateTime.toString(timeFormat);
+    QString format = timeFormat;
+    format.replace(QLatin1String("%a"), QLatin1String("ddd"));
+    format.replace(QLatin1String("%b"), QLatin1String("MMM"));
+    format.replace(QLatin1String("%d"), QLatin1String("dd"));
+    format.replace(QLatin1String("%H"), QLatin1String("HH"));
+    format.replace(QLatin1String("%M"), QLatin1String("MM"));
+    format.replace(QLatin1String("%S"), QLatin1String("ss"));
+    return dateTime.toString(format);
 }
 
 const QString AdiumThemeView::variantName() const

-- 
ktp-text-ui packaging