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

[mrDoctorWhо and Darlan] Fix day and time in RTL message. see #7284

This commit is contained in:
Denis Fomin 2013-08-06 23:42:02 +04:00
parent 4380fb5197
commit d24b3b69c5
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/conversation_textview.py
View File

@ -1302,7 +1302,7 @@ class ConversationTextview(gobject.GObject):
if kind == 'status': if kind == 'status':
direction_mark = i18n.direction_mark direction_mark = i18n.direction_mark
if current_print_time == 'always' and kind != 'info' and not simple: if current_print_time == 'always' and kind != 'info' and not simple:
timestamp_str = self.get_time_to_show(tim) timestamp_str = self.get_time_to_show(tim, direction_mark)
timestamp = time.strftime(timestamp_str, tim) timestamp = time.strftime(timestamp_str, tim)
timestamp = direction_mark + timestamp timestamp = direction_mark + timestamp
buffer_.insert_with_tags_by_name(end_iter, timestamp, buffer_.insert_with_tags_by_name(end_iter, timestamp,
@ -1318,7 +1318,7 @@ class ConversationTextview(gobject.GObject):
ft = self.fc.fuzzy_time(gajim.config.get('print_time_fuzzy'), tim) ft = self.fc.fuzzy_time(gajim.config.get('print_time_fuzzy'), tim)
tim_format = ft.decode(locale.getpreferredencoding()) tim_format = ft.decode(locale.getpreferredencoding())
else: else:
tim_format = self.get_time_to_show(tim) tim_format = self.get_time_to_show(tim, direction_mark)
buffer_.insert_with_tags_by_name(end_iter, tim_format + '\n', buffer_.insert_with_tags_by_name(end_iter, tim_format + '\n',
'time_sometimes') 'time_sometimes')
# If there's a displaymarking, print it here. # If there's a displaymarking, print it here.
@ -1373,7 +1373,7 @@ class ConversationTextview(gobject.GObject):
self.just_cleared = False self.just_cleared = False
buffer_.end_user_action() buffer_.end_user_action()
def get_time_to_show(self, tim): def get_time_to_show(self, tim, direction_mark=''):
""" """
Get the time, with the day before if needed and return it. It DOESN'T Get the time, with the day before if needed and return it. It DOESN'T
format a fuzzy time format a fuzzy time
@ -1392,7 +1392,7 @@ class ConversationTextview(gobject.GObject):
'%(nb_days)i days ago', diff_day, {'nb_days': diff_day}, '%(nb_days)i days ago', diff_day, {'nb_days': diff_day},
{'nb_days': diff_day}) {'nb_days': diff_day})
if day_str: if day_str:
format_ += day_str + ' ' format_ += i18n.direction_mark + day_str + direction_mark + ' '
timestamp_str = gajim.config.get('time_stamp') timestamp_str = gajim.config.get('time_stamp')
timestamp_str = helpers.from_one_line(timestamp_str) timestamp_str = helpers.from_one_line(timestamp_str)
format_ += timestamp_str format_ += timestamp_str