Merge branch 'testing'

plugins/Config/plugin.py

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

plugins/Owner/plugin.py

@@ -42,6 +42,7 @@ else:
 
 import supybot.log as log
 import supybot.conf as conf
+import supybot.i18n as i18n
 import supybot.utils as utils
 import supybot.world as world
 import supybot.ircdb as ircdb
@@ -599,6 +600,12 @@ class Owner(callbacks.Plugin):
         self.reload(irc, msg, [plugin.name()]) # This makes the replySuccess.
     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