Philipp Hörist pushed to branch master at gajim / gajim

Commits: 58dac3ac by Daniel Brötzmann at 2020-01-09T09:52:57+01:00 Dialogs: Use contact's shown name

- - - - -

3 changed files:

- gajim/gtk/filetransfer.py - gajim/gui_interface.py - gajim/roster_window.py

Changes:

===================================== gajim/gtk/filetransfer.py ===================================== @@ -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),

===================================== gajim/gui_interface.py ===================================== @@ -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',

===================================== gajim/roster_window.py ===================================== @@ -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}

View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/58dac3acc62e50435c70e92b9998260920f...