X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Feventstringifier.cpp;h=26a2bbe6200415f5b885224a7ea1ac74a404383f;hp=ac0a3ac1f666c89e51bcf770e9883e06eacbc435;hb=bd5f012ca9d067c2ed55c8f2c5da1657fa81f994;hpb=c64a887d0f05222590299fb2bb8d56fa9fadb16d

diff --git a/src/core/eventstringifier.cpp b/src/core/eventstringifier.cpp
index ac0a3ac1..26a2bbe6 100644
--- a/src/core/eventstringifier.cpp
+++ b/src/core/eventstringifier.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-2012 by the Quassel Project                        *
+ *   Copyright (C) 2005-2013 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -337,6 +337,11 @@ void EventStringifier::processIrcEventTopic(IrcEvent *e)
         .arg(e->nick(), e->params().at(0), e->params().at(1)), QString(), e->params().at(0));
 }
 
+void EventStringifier::processIrcEventWallops(IrcEvent *e)
+{
+    displayMsg(e, Message::Server, tr("[Operwall] %1: %2").arg(e->nick(), e->params().join(" ")));
+}
+
 
 /* RPL_ISUPPORT */
 void EventStringifier::processIrcEvent005(IrcEvent *e)
@@ -457,14 +462,13 @@ void EventStringifier::processIrcEvent317(IrcEvent *e)
 
     if (e->params().count() > 3) { // if we have more then 3 params we have the above mentioned "real life" situation
         QDateTime loginTime = QDateTime::fromTime_t(e->params()[2].toInt());
-        //: Time format. See http://qt-project.org/doc/qt-4.8/qdatetime.html#toString
-        QString formattedLoginTime = loginTime.toString(tr("MMMM d yyyy hh:mm"));
-        displayMsg(e, Message::Server, tr("[Whois] %1 is logged in since %2").arg(e->params()[0], formattedLoginTime));
+        displayMsg(e, Message::Server, tr("[Whois] %1 is logged in since %2")
+	    .arg(e->params()[0], QLocale().toString(loginTime, QLocale().dateTimeFormat())));
     }
-    //: Time format. See http://qt-project.org/doc/qt-4.8/qdatetime.html#toString
-    QString idlingSince = e->timestamp().toLocalTime().addSecs(-idleSecs).toString(tr("MMMM d yyyy hh:mm"));
+    QDateTime idlingSince = e->timestamp().toLocalTime().addSecs(-idleSecs);
     displayMsg(e, Message::Server, tr("[Whois] %1 is idling for %2 (since %3)")
-        .arg(e->params()[0], secondsToString(idleSecs), idlingSince));
+        .arg(e->params()[0], secondsToString(idleSecs),
+	     QLocale().toString(idlingSince, QLocale().dateTimeFormat())));
 }
 
 
@@ -563,9 +567,9 @@ void EventStringifier::processIrcEvent329(IrcEvent *e)
         return;
     }
     QDateTime time = QDateTime::fromTime_t(unixtime);
-    //: Time format. See http://qt-project.org/doc/qt-4.8/qdatetime.html#toString
-    QString formattedTime = time.toString(tr("MMMM d yyyy hh:mm"));
-    displayMsg(e, Message::Topic, tr("Channel %1 created on %2").arg(channel, formattedTime), QString(), channel);
+    displayMsg(e, Message::Topic, tr("Channel %1 created on %2")
+        .arg(channel, QLocale().toString(time, QLocale().dateTimeFormat())),
+	QString(), channel);
 }
 
 
@@ -608,10 +612,10 @@ void EventStringifier::processIrcEvent333(IrcEvent *e)
         return;
 
     QString channel = e->params().first();
-    //: Time format. See http://qt-project.org/doc/qt-4.8/qdatetime.html#toString
-    QString topicSetTime = QDateTime::fromTime_t(e->params()[2].toInt()).toString(tr("MMMM d yyyy hh:mm"));
+    QDateTime topicSetTime = QDateTime::fromTime_t(e->params()[2].toInt());
     displayMsg(e, Message::Topic, tr("Topic set by %1 on %2")
-        .arg(e->params()[1], topicSetTime), QString(), channel);
+        .arg(e->params()[1],
+	     QLocale().toString(topicSetTime, QLocale().dateTimeFormat())), QString(), channel);
 }