mirror of
https://github.com/Mikaela/Limnoria.git
synced 2024-12-23 19:22:45 +01:00
Merge branch 'testing'
This commit is contained in:
commit
8344166fa1
@ -325,8 +325,6 @@ class Factoids(callbacks.Plugin, plugins.ChannelDBHandler):
|
|||||||
self._replyFactoids(irc, msg, key, channel, factoids, number, raw=raw)
|
self._replyFactoids(irc, msg, key, channel, factoids, number, raw=raw)
|
||||||
else:
|
else:
|
||||||
self._replyApproximateFactoids(irc, msg, channel, key)
|
self._replyApproximateFactoids(irc, msg, channel, key)
|
||||||
whatis = wrap(whatis, ['channel', many('something')])
|
|
||||||
|
|
||||||
whatis = wrap(whatis, ['channel',
|
whatis = wrap(whatis, ['channel',
|
||||||
getopts({'raw': '',}),
|
getopts({'raw': '',}),
|
||||||
many('something')])
|
many('something')])
|
||||||
@ -398,7 +396,6 @@ class Factoids(callbacks.Plugin, plugins.ChannelDBHandler):
|
|||||||
irc.replySuccess()
|
irc.replySuccess()
|
||||||
else:
|
else:
|
||||||
irc.error(_('This key-factoid relationship already exists.'))
|
irc.error(_('This key-factoid relationship already exists.'))
|
||||||
|
|
||||||
alias = wrap(alias, ['channel', 'something', 'something', optional('int')])
|
alias = wrap(alias, ['channel', 'something', 'something', optional('int')])
|
||||||
|
|
||||||
@internationalizeDocstring
|
@internationalizeDocstring
|
||||||
|
Loading…
Reference in New Issue
Block a user