copyleftie
/
gajim-plural
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

do not send message if GPG encryption fails. Fixes #7059

This commit is contained in:
Yann Leboulanger 2011-12-17 14:54:29 +01:00
parent 82813ff090
commit 78bd83766c
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/common/connection.py
View File

@ -318,6 +318,7 @@ class CommonConnection:
original_message, fjid, resource, jid, xhtml, subject, original_message, fjid, resource, jid, xhtml, subject,
chatstate, msg_id, label, forward_from, delayed, session, chatstate, msg_id, label, forward_from, delayed, session,
form_node, user_nick, keyID, callback) form_node, user_nick, keyID, callback)
return
self._on_continue_message(type_, msg, msgtxt, original_message, fjid, self._on_continue_message(type_, msg, msgtxt, original_message, fjid,
resource, jid, xhtml, subject, msgenc, keyID, chatstate, msg_id, resource, jid, xhtml, subject, msgenc, keyID, chatstate, msg_id,
@ -333,8 +334,8 @@ class CommonConnection:
if msgenc and not error: if msgenc and not error:
msgtxt = '[This message is *encrypted* (See :XEP:`27`]' msgtxt = '[This message is *encrypted* (See :XEP:`27`]'
lang = os.getenv('LANG') lang = os.getenv('LANG')
if lang is not None and lang != 'en': # we're not english if lang is not None and not lang.startswith('en'):
# one in locale and one en # we're not english: one in locale and one en
msgtxt = _('[This message is *encrypted* (See :XEP:`27`]') + \ msgtxt = _('[This message is *encrypted* (See :XEP:`27`]') + \
' (' + msgtxt + ')' ' (' + msgtxt + ')'
self._on_continue_message(type_, msg, msgtxt, original_message, self._on_continue_message(type_, msg, msgtxt, original_message,