From kde-commits Sat Sep 12 11:44:43 2009 From: Jean-Baptiste Rouault Date: Sat, 12 Sep 2009 11:44:43 +0000 To: kde-commits Subject: branches/KDE/4.3/kdeplasma-addons/applets/microblog Message-Id: <1252755883.300548.12269.nullmailer () svn ! kde ! org> X-MARC-Message: https://marc.info/?l=kde-commits&m=125275589019742 SVN commit 1022729 by jbrouault: backport of r1013632 BUG:194302 BUG:203949 M +3 -1 microblog.cpp --- branches/KDE/4.3/kdeplasma-addons/applets/microblog/microblog.cpp #1022728:1022729 @@ -548,9 +548,11 @@ } QLocale english(QLocale::English, QLocale::UnitedStates); + QDateTime dt = english.toDateTime(tweetData.value( "Date" ).toString(), "ddd MMM dd HH:mm:ss +0000 yyyy"); + dt.setTimeSpec(Qt::UTC); QString html = ""; html += QString("
%1

%3%4

").arg( user).arg(m_colorScheme->foreground(KColorScheme::InactiveText).color().name()) - .arg(timeDescription( english.toDateTime(tweetData.value( "Date" ).toString(), "ddd MMM dd HH:mm:ss +0000 yyyy") )).arg( sourceString); + .arg(timeDescription( dt )).arg( sourceString); QString status = tweetData.value( "Status" ).toString(); status.replace(QRegExp("((http|https)://[^\\s<>'\"]+[^!,\\.\\s<>'\"\\]])"), "\\1");