Merge branch 'testing'

This commit is contained in:
Valentin Lorentz 2010-11-26 23:20:53 +01:00
commit 15de8c2345
2 changed files with 8 additions and 1 deletions

View File

@ -156,7 +156,7 @@ class Config(callbacks.Plugin):
Searches for <word> in the current configuration variables. Searches for <word> in the current configuration variables.
""" """
L = [] L = []
for (name, _) in conf.supybot.getValues(getChildren=True): for (name, x) in conf.supybot.getValues(getChildren=True):
if word in name.lower(): if word in name.lower():
possibleChannel = registry.split(name)[-1] possibleChannel = registry.split(name)[-1]
if not ircutils.isChannel(possibleChannel): if not ircutils.isChannel(possibleChannel):

View File

@ -42,6 +42,7 @@ else:
import supybot.log as log import supybot.log as log
import supybot.conf as conf import supybot.conf as conf
import supybot.i18n as i18n
import supybot.utils as utils import supybot.utils as utils
import supybot.world as world import supybot.world as world
import supybot.ircdb as ircdb import supybot.ircdb as ircdb
@ -599,6 +600,12 @@ class Owner(callbacks.Plugin):
self.reload(irc, msg, [plugin.name()]) # This makes the replySuccess. self.reload(irc, msg, [plugin.name()]) # This makes the replySuccess.
unrename = wrap(unrename, ['plugin']) unrename = wrap(unrename, ['plugin'])
def reloadlocale(self, irc, msg, args):
"""takes no argument
Reloads the locale of the bot."""
i18n.reloadLocales()
irc.replySuccess()
Class = Owner Class = Owner