Verified Commit d2ca062e authored by mathieui's avatar mathieui

Make the features disco in chat more user-friendly

parent 0dc36d95
......@@ -817,32 +817,17 @@ class OneToOneTab(ChatTab):
else:
self.__initial_disco = True
empty = not any((correct, attention, receipts))
features = []
if correct or empty:
features.append(_('message correction (/correct)'))
if attention or empty:
features.append(_('attention requests (/attention)'))
if (receipts or empty) \
and config.get('request_message_receipts'):
features.append(_('message delivery receipts'))
if len(features) > 1:
tail = features.pop()
else:
tail = None
features_str = ', '.join(features)
if tail and empty:
features_str += _(', nor %s') % tail
elif tail:
features_str += _(' and %s') % tail
if empty:
msg = _('\x19%s}This contact does not support %s.')
else:
msg = _('\x19%s}This contact supports %s.')
ok = get_theme().CHAR_OK
nope = get_theme().CHAR_ERROR
correct = ok if correct else nope
attention = ok if attention else nope
receipts = ok if receipts else nope
msg = _('\x19%s}Contact supports: correction [%s], '
'attention [%s], receipts [%s].')
color = dump_tuple(get_theme().COLOR_INFORMATION_TEXT)
msg = msg % (color, features_str)
msg = msg % (color, correct, attention, receipts)
self.add_message(msg, typ=0)
self.core.refresh_window()
......
......@@ -301,10 +301,12 @@ class Theme(object):
CHAR_QUIT = '<---'
CHAR_KICK = '-!-'
CHAR_NEW_TEXT_SEPARATOR = '- '
CHAR_ACK_RECEIVED = '✔'
CHAR_OK = '✔'
CHAR_ERROR = '✖'
CHAR_ACK_RECEIVED = CHAR_OK
CHAR_COLUMN_ASC = ' ▲'
CHAR_COLUMN_DESC = ' ▼'
CHAR_ROSTER_ERROR = '✖'
CHAR_ROSTER_ERROR = CHAR_ERROR
CHAR_ROSTER_TUNE = '♪'
CHAR_ROSTER_ASKED = '?'
CHAR_ROSTER_ACTIVITY = 'A'
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment