[bronger] translate None when selecting gpg key. fixes #2390

This commit is contained in:
Yann Leboulanger 2007-02-18 20:58:56 +00:00
parent d7f5885778
commit aa44fc9eb3
1 changed files with 6 additions and 3 deletions

View File

@ -1535,19 +1535,22 @@ class RosterWindow:
attached_keys = gajim.config.get_per('accounts', account, attached_keys = gajim.config.get_per('accounts', account,
'attached_gpg_keys').split() 'attached_gpg_keys').split()
keys = {} keys = {}
keyID = 'None' #GPG Key
keyID = _('None')
for i in xrange(len(attached_keys)/2): for i in xrange(len(attached_keys)/2):
keys[attached_keys[2*i]] = attached_keys[2*i+1] keys[attached_keys[2*i]] = attached_keys[2*i+1]
if attached_keys[2*i] == contact.jid: if attached_keys[2*i] == contact.jid:
keyID = attached_keys[2*i+1] keyID = attached_keys[2*i+1]
public_keys = gajim.connections[account].ask_gpg_keys() public_keys = gajim.connections[account].ask_gpg_keys()
public_keys['None'] = 'None' #GPG Key
public_keys[_('None')] = _('None')
instance = dialogs.ChooseGPGKeyDialog(_('Assign OpenPGP Key'), instance = dialogs.ChooseGPGKeyDialog(_('Assign OpenPGP Key'),
_('Select a key to apply to the contact'), public_keys, keyID) _('Select a key to apply to the contact'), public_keys, keyID)
keyID = instance.run() keyID = instance.run()
if keyID is None: if keyID is None:
return return
if keyID[0] == 'None': #GPG Key
if keyID[0] == _('None'):
if contact.jid in keys: if contact.jid in keys:
del keys[contact.jid] del keys[contact.jid]
for u in gajim.contacts.get_contact(account, contact.jid): for u in gajim.contacts.get_contact(account, contact.jid):