Merge pull request #1 from ProgVal/patch-1

Improve readability of string interpolations
This commit is contained in:
GLolol 2014-02-02 09:27:14 -08:00
commit 8bcadc6955

View File

@ -247,7 +247,7 @@ class LinkRelay(callbacks.Plugin):
if self.registryValue('color', msg.args[0]): if self.registryValue('color', msg.args[0]):
args['color'] = '\x03%s' % self.registryValue('colors.join', msg.args[0]) args['color'] = '\x03%s' % self.registryValue('colors.join', msg.args[0])
if self.registryValue('hostmasks', msg.args[0]): if self.registryValue('hostmasks', msg.args[0]):
args['userhost'] = '%s%s%s%s%s' % (' (', msg.user, '@', msg.host, ')') args['userhost'] = ' (%s@%s)' % (msg.user, msg.host)
s = '%(color)s' + _('JOIN: %(nick)s%(sepTagn)s%(network)s' s = '%(color)s' + _('JOIN: %(nick)s%(sepTagn)s%(network)s'
'%(userhost)s has joined %(channel)s%(sepTagc)s' '%(userhost)s has joined %(channel)s%(sepTagc)s'
'%(network)s') '%(network)s')
@ -263,9 +263,9 @@ class LinkRelay(callbacks.Plugin):
if self.registryValue('color', msg.args[0]): if self.registryValue('color', msg.args[0]):
args['color'] = '\x03%s' % self.registryValue('colors.part', msg.args[0]) args['color'] = '\x03%s' % self.registryValue('colors.part', msg.args[0])
if self.registryValue('hostmasks', msg.args[0]): if self.registryValue('hostmasks', msg.args[0]):
args['userhost'] = '%s%s%s%s%s' % (' (', msg.user, '@', msg.host, ')') args['userhost'] = ' (%s@%s)' % (msg.user, msg.host)
try: try:
args['message'] = '%s%s%s' % (' (', msg.args[1], ')') args['message'] = '(%s)' % (msg.args[1])
except IndexError: except IndexError:
pass pass
s = '%(color)s' + _('PART: %(nick)s%(sepTagn)s%(network)s' s = '%(color)s' + _('PART: %(nick)s%(sepTagn)s%(network)s'