Author: bct Date: 2008-09-08 17:51:13 +0200 (Mon, 08 Sep 2008) New Revision: 10397

Modified: trunk/src/chat_control.py Log: consolidate e2e status messages

Modified: trunk/src/chat_control.py =================================================================== --- trunk/src/chat_control.py 2008-09-08 12:00:27 UTC (rev 10396) +++ trunk/src/chat_control.py 2008-09-08 15:51:13 UTC (rev 10397) @@ -1798,13 +1798,12 @@ '''print esession settings to textview''' e2e_is_active = bool(self.session) and self.session.enable_encryption if e2e_is_active: - msg = _('E2E encryption enabled') - ChatControlBase.print_conversation_line(self, msg, 'status', '', None) + msg = _('This session is encrypted')

if self.session.is_loggable(): - msg = _('Session WILL be logged') + msg += _(' and WILL be logged') else: - msg = _('Session WILL NOT be logged') + msg += _(' and WILL NOT be logged')

ChatControlBase.print_conversation_line(self, msg, 'status', '', None)