From 74f2b75fac469bba4a72cb43fa1c50e433253bb9 Mon Sep 17 00:00:00 2001 From: Jeremy Fincher Date: Sat, 17 Apr 2004 14:46:50 +0000 Subject: [PATCH] Small changes. jamessan, look at this. --- plugins/Babelfish.py | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/plugins/Babelfish.py b/plugins/Babelfish.py index 157d2ee44..fd92c6258 100644 --- a/plugins/Babelfish.py +++ b/plugins/Babelfish.py @@ -111,13 +111,14 @@ class Babelfish(callbacks.Privmsg): irc.reply(translation) except (KeyError, babelfish.LanguageNotAvailableError), e: irc.error('%s is not a valid language. Valid languages ' - 'include %s' % + 'include %s.' % + # FIXME: Subtract disabledLanguages from these. (e, utils.commaAndify(babelfish.available_languages))) except babelfish.BabelizerIOError, e: irc.error(str(e)) except babelfish.BabelfishChangedError, e: irc.error('Babelfish has foiled our plans by changing its ' - 'webpage format') + 'webpage format.') def babelize(self, irc, msg, args): """ @@ -130,7 +131,7 @@ class Babelfish(callbacks.Privmsg): try: (fromLang, toLang) = self._getLang(fromLang, toLang, msg.args[0]) if fromLang != 'english' and toLang != 'english': - irc.error('One language must be English.') + irc.error('One language in babelize must be English.') return if not fromLang or not toLang: langs = self.registryValue('disabledLanguages', msg.args[0]) @@ -141,13 +142,13 @@ class Babelfish(callbacks.Privmsg): irc.reply(translations[-1]) except (KeyError, babelfish.LanguageNotAvailableError), e: irc.reply('%s is not a valid language. Valid languages ' - 'include %s' % + 'include %s.' % (e, utils.commaAndify(babelfish.available_languages))) except babelfish.BabelizerIOError, e: irc.reply(e) except babelfish.BabelfishChangedError, e: irc.reply('Babelfish has foiled our plans by changing its ' - 'webpage format') + 'webpage format.') def randomlanguage(self, irc, msg, args): """[] @@ -158,8 +159,9 @@ class Babelfish(callbacks.Privmsg): allowEnglish = privmsgs.getArgs(args, required=0, optional=1) language = random.choice(babelfish.available_languages) disabled = self.registryValue('disabledLanguages', msg.args[0]) + # XXX: Can this loop forever if disabled == available_languages? while not allowEnglish and language == 'English' and\ - language not in disabled: + language not in disabled: language = random.choice(babelfish.available_languages) irc.reply(language)