Author: asterix
Date: 2008-08-26 13:10:13 +0200 (Tue, 26 Aug 2008)
New Revision: 10300
Modified:
trunk/src/chat_control.py
Log:
fix some coding standards and remove + to merge strings in translated strings. fixes #4211
Modified: trunk/src/chat_control.py
===================================================================
--- trunk/src/chat_control.py 2008-08-26 10:55:18 UTC (rev 10299)
+++ trunk/src/chat_control.py 2008-08-26 11:10:13 UTC (rev 10300)
@@ -1827,23 +1827,20 @@
if self.session and self.session.enable_encryption:
# ESessions
if not encrypted:
- msg = _('The following message was ' + \
- 'NOT encrypted')
- ChatControlBase.print_conversation_line(
- self, msg, 'status', '', tim)
+ msg = _('The following message was NOT encrypted')
+ ChatControlBase.print_conversation_line(self, msg, 'status', '',
+ tim)
else:
# GPG encryption
if encrypted and not self.gpg_is_active:
- msg = _('The following message was ' + \
- 'encrypted')
- ChatControlBase.print_conversation_line(
- self, msg, 'status', '', tim)
+ msg = _('The following message was encrypted')
+ ChatControlBase.print_conversation_line(self, msg, 'status', '',
+ tim)
self._toggle_gpg()
elif not encrypted and self.gpg_is_active:
- msg = _('The following message was ' + \
- 'NOT encrypted')
- ChatControlBase.print_conversation_line(
- self, msg, 'status', '', tim)
+ msg = _('The following message was NOT encrypted')
+ ChatControlBase.print_conversation_line(self, msg, 'status', '',
+ tim)
if not frm:
kind = 'incoming'
name = contact.get_shown_name()
@@ -1853,7 +1850,8 @@
else:
kind = 'outgoing'
name = gajim.nicks[self.account]
- if not xhtml and not encrypted and gajim.config.get('rst_formatting_outgoing_messages'):
+ if not xhtml and not encrypted and gajim.config.get(
+ 'rst_formatting_outgoing_messages'):
xhtml = create_xhtml(text)
if xhtml:
xhtml = '<body xmlns="%s">%s</body>' % (NS_XHTML, xhtml)