copyleftie/gajim-plural
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

use get_time_to_show in conversation_textview that print "yesterday" or "X days ago". fixes #2797

Browse source
This commit is contained in:
Yann Leboulanger 2007-01-15 18:37:19 +00:00
parent 3c9170cb61
commit 2403239695
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/conversation_textview.py
View file

@ -688,8 +688,7 @@ class ConversationTextview:
tim = time.localtime() tim = time.localtime()
current_print_time = gajim.config.get('print_time') current_print_time = gajim.config.get('print_time')
if current_print_time == 'always' and kind != 'info': if current_print_time == 'always' and kind != 'info':
timestamp_str = gajim.config.get('time_stamp') timestamp_str = self.get_time_to_show(tim)
timestamp_str = helpers.from_one_line(timestamp_str)
timestamp = time.strftime(timestamp_str, tim) timestamp = time.strftime(timestamp_str, tim)
buffer.insert_with_tags_by_name(end_iter, timestamp, buffer.insert_with_tags_by_name(end_iter, timestamp,
*other_tags_for_time) *other_tags_for_time)
@ -757,7 +756,9 @@ class ConversationTextview:
day_str = _('%i days ago') % diff_day day_str = _('%i days ago') % diff_day
if day_str: if day_str:
format += day_str + ' ' format += day_str + ' '
format += '%X' timestamp_str = gajim.config.get('time_stamp')
timestamp_str = helpers.from_one_line(timestamp_str)
format += timestamp_str
tim_format = time.strftime(format, tim) tim_format = time.strftime(format, tim)
if locale.getpreferredencoding() != 'KOI8-R': if locale.getpreferredencoding() != 'KOI8-R':
# if tim_format comes as unicode because of day_str. # if tim_format comes as unicode because of day_str.