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

roster-tooltip : Change lines order, resource after jid, gpg on the end (we don't care) 

deleted hack to remove seconds, do not work with all locales (greek at least)
This commit is contained in:
Jean-Marie Traissard 2006-09-27 22:06:53 +00:00
parent fd0a9e863f
commit ac1b317f62
1 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/tooltips.py
View File

@ -530,12 +530,8 @@ class RosterTooltip(NotificationAreaTooltip):
if time.strftime('%j', time.localtime())== \ if time.strftime('%j', time.localtime())== \
time.strftime('%j', contact.last_status_time): time.strftime('%j', contact.last_status_time):
# it's today, show only the locale hour representation # it's today, show only the locale hour representation
# FIXME : last_status_time is UTC but _we_ may not be
local_time = time.strftime('%X', contact.last_status_time) local_time = time.strftime('%X', contact.last_status_time)
# Hack to delete seconds
# We can't use hour:minutes directly because we don't
# know if we should use %H or %I (depend of user locale)
# See http://docs.python.org/lib/module-time.html
local_time = local_time[:-3]
else: else:
# time.strftime returns locale encoded string # time.strftime returns locale encoded string
local_time = time.strftime('%c', contact.last_status_time) local_time = time.strftime('%c', contact.last_status_time)
@ -557,10 +553,18 @@ class RosterTooltip(NotificationAreaTooltip):
properties.append((show, None)) properties.append((show, None))
properties.append((_('Jabber ID: '), prim_contact.jid )) properties.append((_('Jabber ID: '), prim_contact.jid ))
# contact has only one ressource
if num_resources == 1 and contact.resource:
properties.append((_('Resource: '),
gtkgui_helpers.escape_for_pango_markup(contact.resource) + ' (' + \
unicode(contact.priority) + ')'))
if prim_contact.sub and prim_contact.sub != 'both': if prim_contact.sub and prim_contact.sub != 'both':
# ('both' is the normal sub so we don't show it) # ('both' is the normal sub so we don't show it)
properties.append(( _('Subscription: '), properties.append(( _('Subscription: '),
gtkgui_helpers.escape_for_pango_markup(helpers.get_uf_sub(prim_contact.sub)))) gtkgui_helpers.escape_for_pango_markup(helpers.get_uf_sub(prim_contact.sub))))
if prim_contact.keyID: if prim_contact.keyID:
keyID = None keyID = None
if len(prim_contact.keyID) == 8: if len(prim_contact.keyID) == 8:
@ -571,13 +575,6 @@ class RosterTooltip(NotificationAreaTooltip):
properties.append((_('OpenPGP: '), properties.append((_('OpenPGP: '),
gtkgui_helpers.escape_for_pango_markup(keyID))) gtkgui_helpers.escape_for_pango_markup(keyID)))
# contact has only one ressource
if num_resources == 1 and contact.resource:
properties.append((_('Resource: '),
gtkgui_helpers.escape_for_pango_markup(contact.resource) + ' (' + \
unicode(contact.priority) + ')'))
while properties: while properties:
property = properties.pop(0) property = properties.pop(0)
vcard_current_row += 1 vcard_current_row += 1