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

fix some coding standards and remove + to merge strings in translated strings. fixes #4211

This commit is contained in:
Yann Leboulanger 2008-08-26 11:10:13 +00:00
parent fc8d21fd5e
commit 26334c7064
1 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/chat_control.py
View File

@ -1827,23 +1827,20 @@ class ChatControl(ChatControlBase):
if self.session and self.session.enable_encryption: if self.session and self.session.enable_encryption:
# ESessions # ESessions
if not encrypted: if not encrypted:
msg = _('The following message was ' + \ msg = _('The following message was NOT encrypted')
'NOT encrypted') ChatControlBase.print_conversation_line(self, msg, 'status', '',
ChatControlBase.print_conversation_line( tim)
self, msg, 'status', '', tim)
else: else:
# GPG encryption # GPG encryption
if encrypted and not self.gpg_is_active: if encrypted and not self.gpg_is_active:
msg = _('The following message was ' + \ msg = _('The following message was encrypted')
'encrypted') ChatControlBase.print_conversation_line(self, msg, 'status', '',
ChatControlBase.print_conversation_line( tim)
self, msg, 'status', '', tim)
self._toggle_gpg() self._toggle_gpg()
elif not encrypted and self.gpg_is_active: elif not encrypted and self.gpg_is_active:
msg = _('The following message was ' + \ msg = _('The following message was NOT encrypted')
'NOT encrypted') ChatControlBase.print_conversation_line(self, msg, 'status', '',
ChatControlBase.print_conversation_line( tim)
self, msg, 'status', '', tim)
if not frm: if not frm:
kind = 'incoming' kind = 'incoming'
name = contact.get_shown_name() name = contact.get_shown_name()
@ -1853,7 +1850,8 @@ class ChatControl(ChatControlBase):
else: else:
kind = 'outgoing' kind = 'outgoing'
name = gajim.nicks[self.account] 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) xhtml = create_xhtml(text)
if xhtml: if xhtml:
xhtml = '<body xmlns="%s">%s</body>' % (NS_XHTML, xhtml) xhtml = '<body xmlns="%s">%s</body>' % (NS_XHTML, xhtml)