Philipp Hörist pushed to branch master at gajim / gajim
Commits:
-
58dac3ac
by Daniel Brötzmann at 2020-01-09T09:52:57+01:00
3 changed files:
Changes:
| ... | ... | @@ -483,7 +483,7 @@ class FileTransfersWindow: |
| 483 | 483 |
|
| 484 | 484 |
NewConfirmationDialog(
|
| 485 | 485 |
_('File Transfer Request'),
|
| 486 |
- _('%s wants to send you a file') % contact.jid,
|
|
| 486 |
+ _('%s wants to send you a file') % contact.jid.get_shown_name(),
|
|
| 487 | 487 |
sectext,
|
| 488 | 488 |
[DialogButton.make('Cancel',
|
| 489 | 489 |
callback=_on_cancel),
|
| ... | ... | @@ -357,9 +357,11 @@ class Interface: |
| 357 | 357 |
def _remove():
|
| 358 | 358 |
self.roster.on_req_usub(None, [(contact, account)])
|
| 359 | 359 |
|
| 360 |
+ name = contact.get_shown_name()
|
|
| 361 |
+ jid = contact.jid
|
|
| 360 | 362 |
NewConfirmationDialog(
|
| 361 | 363 |
_('Subscription Removed'),
|
| 362 |
- _('Contact \'%s\' removed subscription from you') % contact.jid,
|
|
| 364 |
+ _('%s (%s) has removed subscription from you') % (name, jid),
|
|
| 363 | 365 |
_('You will always see this contact as offline.\n'
|
| 364 | 366 |
'Do you want to remove them from your contact list?'),
|
| 365 | 367 |
[DialogButton.make('Cancel',
|
| ... | ... | @@ -3325,7 +3325,7 @@ class RosterWindow: |
| 3325 | 3325 |
contact = list_[0][0]
|
| 3326 | 3326 |
title = _('Remove Contact')
|
| 3327 | 3327 |
pritext = _('Remove contact from contact list')
|
| 3328 |
- sectext = _('You are about to remove \'%(name)s\' (%(jid)s) from '
|
|
| 3328 |
+ sectext = _('You are about to remove %(name)s (%(jid)s) from '
|
|
| 3329 | 3329 |
'your contact list.\n') % {
|
| 3330 | 3330 |
'name': contact.get_shown_name(),
|
| 3331 | 3331 |
'jid': contact.jid}
|