'Encryption disabled' string is not sent through Jabber, so no need to have it twice (once untranslated and once translated)
This commit is contained in:
parent
e4932f56be
commit
3cb66c10d8
|
@ -24,7 +24,6 @@ import gobject
|
||||||
import time
|
import time
|
||||||
import urllib
|
import urllib
|
||||||
import base64
|
import base64
|
||||||
import os
|
|
||||||
|
|
||||||
import dialogs
|
import dialogs
|
||||||
import chat
|
import chat
|
||||||
|
@ -389,19 +388,12 @@ class TabbedChatWindow(chat.Chat):
|
||||||
else:
|
else:
|
||||||
ec = gajim.encrypted_chats[self.account]
|
ec = gajim.encrypted_chats[self.account]
|
||||||
if encrypted and jid not in ec:
|
if encrypted and jid not in ec:
|
||||||
msg = 'Encryption enabled'
|
msg = _('Encryption enabled')
|
||||||
lang = os.getenv('LANG')
|
|
||||||
if lang is not None or lang != 'en': # we're not english
|
|
||||||
msg = _('Encryption enabled')\
|
|
||||||
+ ' (Encryption enabled)' # one in locale and one in en
|
|
||||||
chat.Chat.print_conversation_line(self, msg, jid,
|
chat.Chat.print_conversation_line(self, msg, jid,
|
||||||
'status', '', tim)
|
'status', '', tim)
|
||||||
ec.append(jid)
|
ec.append(jid)
|
||||||
if not encrypted and jid in ec:
|
if not encrypted and jid in ec:
|
||||||
msg = 'Encryption disabled'
|
msg = _('Encryption disabled')
|
||||||
lang = os.getenv('LANG')
|
|
||||||
if lang is not None or lang != 'en': # we're not english
|
|
||||||
msg = _('Encryption disabled') + ' (Encryption disabled)'
|
|
||||||
chat.Chat.print_conversation_line(self, msg, jid,
|
chat.Chat.print_conversation_line(self, msg, jid,
|
||||||
'status', '', tim)
|
'status', '', tim)
|
||||||
ec.remove(jid)
|
ec.remove(jid)
|
||||||
|
|
Loading…
Reference in New Issue