From 47d7f5e18b562f28f18bc2189c8de06eabcabdd2 Mon Sep 17 00:00:00 2001 From: James Vega Date: Thu, 8 Apr 2004 14:34:54 +0000 Subject: [PATCH] Correctly get the disabledLanguages value (it's a ChannelValue, not GlobalValue) and update the tests to match the new failure string. --- plugins/Babelfish.py | 14 +++++++------- test/test_Babelfish.py | 10 +++++----- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/plugins/Babelfish.py b/plugins/Babelfish.py index 0f00d737a..157d2ee44 100644 --- a/plugins/Babelfish.py +++ b/plugins/Babelfish.py @@ -75,10 +75,10 @@ class Babelfish(callbacks.Privmsg): for language in babelfish.available_languages: _abbrevs[language] = language - def _getLang(self, fromLang, toLang): + def _getLang(self, fromLang, toLang, chan): fromLang = self._abbrevs[fromLang.lower()] toLang = self._abbrevs[toLang.lower()] - disabled = map(str.lower, self.registryValue('disabledLanguages')) + disabled = map(str.lower, self.registryValue('disabledLanguages',chan)) if fromLang in disabled: fromLang = None if toLang in disabled: @@ -101,9 +101,9 @@ class Babelfish(callbacks.Privmsg): args.pop(1) (fromLang, toLang, text) = privmsgs.getArgs(args, required=3) try: - (fromLang, toLang) = self._getLang(fromLang, toLang) + (fromLang, toLang) = self._getLang(fromLang, toLang, msg.args[0]) if not fromLang or not toLang: - langs = self.registryValue('disabledLanguages') + langs = self.registryValue('disabledLanguages', msg.args[0]) irc.error('I do not speak %s.' % utils.commaAndify(langs, And='or')) return @@ -128,12 +128,12 @@ class Babelfish(callbacks.Privmsg): """ (fromLang, toLang, text) = privmsgs.getArgs(args, required=3) try: - (fromLang, toLang) = self._getLang(fromLang, toLang) + (fromLang, toLang) = self._getLang(fromLang, toLang, msg.args[0]) if fromLang != 'english' and toLang != 'english': irc.error('One language must be English.') return if not fromLang or not toLang: - langs = self.registryValue('disabledLanguages') + langs = self.registryValue('disabledLanguages', msg.args[0]) irc.error('I do not speak %s.' % utils.commaAndify(langs, And='or')) return @@ -157,7 +157,7 @@ class Babelfish(callbacks.Privmsg): """ allowEnglish = privmsgs.getArgs(args, required=0, optional=1) language = random.choice(babelfish.available_languages) - disabled = self.registryValue('disabledLanguages') + disabled = self.registryValue('disabledLanguages', msg.args[0]) while not allowEnglish and language == 'English' and\ language not in disabled: language = random.choice(babelfish.available_languages) diff --git a/test/test_Babelfish.py b/test/test_Babelfish.py index a765f55b8..e69b48ab7 100644 --- a/test/test_Babelfish.py +++ b/test/test_Babelfish.py @@ -56,13 +56,13 @@ if network: dl.set("") self.assertResponse('translate sp en hola', 'hello') dl.set("Spanish") - self.assertRegexp('translate sp en hola', 'forbidden') - self.assertRegexp('translate en sp hola', 'forbidden') + self.assertRegexp('translate sp en hola', 'do not speak') + self.assertRegexp('translate en sp hola', 'do not speak') dl.set("Spanish Italian") - self.assertRegexp('translate sp en hola', 'forbidden') - self.assertRegexp('translate en it hello', 'forbidden') + self.assertRegexp('translate sp en hola', 'do not speak') + self.assertRegexp('translate en it hello', 'do not speak') self.assertRegexp('translate en it [translate sp en hola]', - 'forbidden') + 'do not speak') dl.set("") self.assertResponse('translate en it hello', 'ciao') finally: