Commit 58dac3ac authored by Daniel Brötzmann's avatar Daniel Brötzmann Committed by Philipp Hörist

Dialogs: Use contact's shown name

parent cf182e23
......@@ -483,7 +483,7 @@ class FileTransfersWindow:
NewConfirmationDialog(
_('File Transfer Request'),
_('%s wants to send you a file') % contact.jid,
_('%s wants to send you a file') % contact.jid.get_shown_name(),
sectext,
[DialogButton.make('Cancel',
callback=_on_cancel),
......
......@@ -357,9 +357,11 @@ class Interface:
def _remove():
self.roster.on_req_usub(None, [(contact, account)])
name = contact.get_shown_name()
jid = contact.jid
NewConfirmationDialog(
_('Subscription Removed'),
_('Contact \'%s\' removed subscription from you') % contact.jid,
_('%s (%s) has removed subscription from you') % (name, jid),
_('You will always see this contact as offline.\n'
'Do you want to remove them from your contact list?'),
[DialogButton.make('Cancel',
......
......@@ -3325,7 +3325,7 @@ class RosterWindow:
contact = list_[0][0]
title = _('Remove Contact')
pritext = _('Remove contact from contact list')
sectext = _('You are about to remove \'%(name)s\' (%(jid)s) from '
sectext = _('You are about to remove %(name)s (%(jid)s) from '
'your contact list.\n') % {
'name': contact.get_shown_name(),
'jid': contact.jid}
......
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