diff options
author | Florent Le Coz <louiz@louiz.org> | 2011-09-11 04:22:04 +0200 |
---|---|---|
committer | Florent Le Coz <louiz@louiz.org> | 2011-09-11 04:22:04 +0200 |
commit | b7b1faebdb52e8f041867f19f29a08f64cfaf220 (patch) | |
tree | 180c45399c1907c853bdf25585ec203c04fc8e9e /src/room.py | |
parent | 78c216cd61ab96f7476ce194323517b73b8ee04c (diff) | |
parent | ce1fb8af014e90cfc7378022c8cbdd134e45ed4a (diff) | |
download | poezio-b7b1faebdb52e8f041867f19f29a08f64cfaf220.tar.gz poezio-b7b1faebdb52e8f041867f19f29a08f64cfaf220.tar.bz2 poezio-b7b1faebdb52e8f041867f19f29a08f64cfaf220.tar.xz poezio-b7b1faebdb52e8f041867f19f29a08f64cfaf220.zip |
merge
Diffstat (limited to 'src/room.py')
-rw-r--r-- | src/room.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/room.py b/src/room.py index 7719dd67..1ca3f599 100644 --- a/src/room.py +++ b/src/room.py @@ -120,7 +120,9 @@ class Room(TextBuffer): nick_color = highlight time = time or datetime.now() message = Message(txt='%s\x19o'%(txt,), nick_color=nick_color, - time=time, nickname=nickname, user=user) + time=time, str_time=time.strftime("%Y-%m-%d %H:%M:%S")\ + if history else time.strftime("%H:%M:%S"),\ + nickname=nickname, user=user) while len(self.messages) > self.messages_nb_limit: self.messages.pop(0) self.messages.append(message) |