Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
e361081d6f
@ -358,9 +358,8 @@
|
||||
this.el.innerHTML = tpl_roster_item(
|
||||
_.extend(item.toJSON(), {
|
||||
'desc_status': STATUSES[item.get('chat_status')||'offline'],
|
||||
'desc_chat': __('Click to chat with this contact'),
|
||||
'desc_chat': __('Click to chat with %1$s (JID: %2$s)', item.get('fullname'), item.get('jid')),
|
||||
'desc_remove': __('Click to remove %1$s as a contact', item.get('fullname')),
|
||||
'title_fullname': __('Name'),
|
||||
'allow_contact_removal': _converse.allow_contact_removal,
|
||||
'num_unread': item.get('num_unread') || 0
|
||||
})
|
||||
|
@ -1,5 +1,5 @@
|
||||
<a class="open-chat {[ if (o.num_unread) { ]} unread-msgs {[ } ]}"
|
||||
title="{{{o.title_fullname}}}: {{{o.fullname}}} JID: {{{o.jid}}} {{{o.desc_chat}}}"
|
||||
title="{{{o.desc_chat}}}"
|
||||
href="#">
|
||||
<div class="avatar avatar-{{{o.chat_status}}}">
|
||||
<span class="status-icon icon-{{{o.chat_status}}}" title="{{{o.desc_status}}}"></span>
|
||||
|
Loading…
Reference in New Issue
Block a user