supybot.plugins.Babelfish.disabledLanguages ->

supybot.plugins.Babelfish.languages

ChangeLog

@@ -29,6 +29,11 @@
 	identifies or joins a channel.  These latter variables are, of
 	course, channel variables.
 
+	* Added configuration variable
+	supybot.plugins.Babelfish.languages (which replaces the old
+	supybot.plugins.Babelfish.disabledLanguages) for specifying
+	which languages will be translated/spoken.
+	
 	* Fixed bug #863601, plugin BadWords fails on color codes.
 
 	* Replaced Sourceforge.{rfe,bug} with Sourceforge.tracker, which

RELNOTES

@@ -1,13 +1,18 @@
 Version 0.77.2
 
-This is a drop-in replacement for 0.77.1, with one exception.  The
+This is a drop-in replacement for 0.77.1, with two exceptions.  The
 configuration variable formerly known as
 "supybot.plugins.Services.password" is now known as
 "supybot.plugins.Services.NickServ.password", due to the fact that
 there might be different passwords for NickServ and ChanServ (and
 ChanServ passwords are per-channel, whereas NickServ passwords are
 global).  If you're using the Services plugin, you'll need to make
-this change in order to continue identifying with services.
+this change in order to continue identifying with services. The
+configuration variable formerly known as
+"supybot.plugins.Babelfish.disabledLanguages" is now known as
+"supybot.plugins.Babelfish.languages".  The configuration variable now
+accepts the languages that *will* be translated as opposed to ones
+that are *not* translated.
 
 Version 0.77.1
 

plugins/Babelfish.py

@@ -35,6 +35,7 @@ Babelfish-related commands.
 
 __revision__ = "$Id$"
 
+import sets
 import random
 from itertools import imap
 
@@ -51,16 +52,17 @@ class Languages(registry.OnlySomeStrings):
     normalize = staticmethod(str.capitalize)
 
 class SpaceSeparatedListOfLanguages(registry.SeparatedListOf):
+    List = sets.Set
     Value = Languages
     def splitter(self, s):
         return s.split()
     joiner = ' '.join
         
 conf.registerPlugin('Babelfish')
-conf.registerChannelValue(conf.supybot.plugins.Babelfish, 'disabledLanguages',
+conf.registerChannelValue(conf.supybot.plugins.Babelfish, 'languages',
-    SpaceSeparatedListOfLanguages([], """Determines which languages are
+    SpaceSeparatedListOfLanguages(babelfish.available_languages, """Determines
-    unavailable for translation; valid input is a list of languages separated
+    which languages are available for translation; valid input is a list of
-    by spaces."""))
+    languages separated by spaces."""))
 
 class Babelfish(callbacks.Privmsg):
     threaded = True
@@ -78,10 +80,10 @@ class Babelfish(callbacks.Privmsg):
     def _getLang(self, fromLang, toLang, chan):
         fromLang = self._abbrevs[fromLang.lower()]
         toLang = self._abbrevs[toLang.lower()]
-        disabled = map(str.lower, self.registryValue('disabledLanguages',chan))
+        languages = map(str.lower, self.registryValue('languages',chan))
-        if fromLang in disabled:
+        if fromLang not in languages:
             fromLang = None
-        if toLang in disabled:
+        if toLang not in languages:
             toLang = None
         return (fromLang, toLang)
         
@@ -100,11 +102,16 @@ class Babelfish(callbacks.Privmsg):
         if len(args) >= 2 and args[1] == 'to':
             args.pop(1)
         (fromLang, toLang, text) = privmsgs.getArgs(args, required=3)
+        chan = msg.args[0]
         try:
-            (fromLang, toLang) = self._getLang(fromLang, toLang, msg.args[0])
+            (fromLang, toLang) = self._getLang(fromLang, toLang, chan)
             if not fromLang or not toLang:
-                langs = self.registryValue('disabledLanguages', msg.args[0])
+                langs = self.registryValue('languages', chan)
-                irc.error('I do not speak %s.' % utils.commaAndify(langs,
+                if not langs:
+                    irc.error('I do not speak any other languages.')
+                    return
+                else:
+                    irc.error('I only speak %s.' % utils.commaAndify(langs,
                                                                      And='or'))
                     return
             translation = babelfish.translate(text, fromLang, toLang)
@@ -112,8 +119,7 @@ class Babelfish(callbacks.Privmsg):
         except (KeyError, babelfish.LanguageNotAvailableError), e:
             irc.error('%s is not a valid language.  Valid languages '
                       'include %s.' %
-                      # FIXME: Subtract disabledLanguages from these.
+                      (e, self.registryValue('languages', chan)))
-                      (e, utils.commaAndify(babelfish.available_languages)))
         except babelfish.BabelizerIOError, e:
             irc.error(str(e))
         except babelfish.BabelfishChangedError, e:
@@ -128,22 +134,27 @@ class Babelfish(callbacks.Privmsg):
         of the languages must be English.
         """
         (fromLang, toLang, text) = privmsgs.getArgs(args, required=3)
+        chan = msg.args[0]
         try:
-            (fromLang, toLang) = self._getLang(fromLang, toLang, msg.args[0])
+            (fromLang, toLang) = self._getLang(fromLang, toLang, chan)
             if fromLang != 'english' and toLang != 'english':
                 irc.error('One language in babelize must be English.')
                 return
             if not fromLang or not toLang:
-                langs = self.registryValue('disabledLanguages', msg.args[0])
+                langs = self.registryValue('languages', chan)
-                irc.error('I do not speak %s.' % utils.commaAndify(langs,
+                if not langs:
+                    irc.error('I do not speak any other languages.')
+                    return
+                else:
+                    irc.error('I only speak %s.' % utils.commaAndify(langs,
                                                                      And='or'))
                     return
             translations = babelfish.babelize(text, fromLang, toLang)
             irc.reply(translations[-1])
         except (KeyError, babelfish.LanguageNotAvailableError), e:
             irc.reply('%s is not a valid language.  Valid languages '
-                      'include %s.' %
+                      'include %s.' % (e,
-                      (e, utils.commaAndify(babelfish.available_languages)))
+                                       self.registryValue('languages', chan)))
         except babelfish.BabelizerIOError, e:
             irc.reply(e)
         except babelfish.BabelfishChangedError, e:
@@ -157,12 +168,12 @@ class Babelfish(callbacks.Privmsg):
         is provided, will include English in the list of possible languages.
         """
         allowEnglish = privmsgs.getArgs(args, required=0, optional=1)
-        language = random.choice(babelfish.available_languages)
+        languages = self.registryValue('languages', msg.args[0])
-        disabled = self.registryValue('disabledLanguages', msg.args[0])
+        if not languages:
-        # XXX: Can this loop forever if disabled == available_languages?
+            irc.error('I can\'t speak any other languages.')
-        while not allowEnglish and language == 'English' and\
+        language = random.choice(languages)
-                  language not in disabled:
+        while not allowEnglish and language == 'English':
-            language = random.choice(babelfish.available_languages)
+            language = random.choice(languages)
         irc.reply(language)
 
 Class = Babelfish

test/test_Babelfish.py

@@ -48,25 +48,29 @@ if network:
 
         def testRandomlanguage(self):
             self.assertNotError('randomlanguage')
+            try:
+                orig = conf.supybot.plugins.Babelfish.languages()
+                conf.supybot.plugins.Babelfish.languages.setValue([])
+                self.assertError('randomlanguage')
+            finally:
+                conf.supybot.plugins.Babelfish.languages.setValue(orig)
 
         def testDisabledLanguages(self):
-            dl = conf.supybot.plugins.Babelfish.disabledLanguages
+            langs = conf.supybot.plugins.Babelfish.languages
             try:
-                orig = dl()
+                orig = langs()
-                dl.set("")
+                langs.setValue(['Spanish', 'English'])
                 self.assertResponse('translate sp en hola', 'hello')
-                dl.set("Spanish")
+                langs.setValue([])
                 self.assertRegexp('translate sp en hola', 'do not speak')
                 self.assertRegexp('translate en sp hola', 'do not speak')
-                dl.set("Spanish Italian")
+                langs.setValue(['Spanish', 'Italian'])
-                self.assertRegexp('translate sp en hola', 'do not speak')
+                self.assertRegexp('translate sp en hola', 'only speak')
-                self.assertRegexp('translate en it hello', 'do not speak')
+                self.assertRegexp('translate en it hello', 'only speak')
-                self.assertRegexp('translate en it [translate sp en hola]',
+                langs.setValue(['English', 'Italian'])
-                    'do not speak')
-                dl.set("")
                 self.assertResponse('translate en it hello', 'ciao')
             finally:
-                dl.set(' '.join(orig))
+                langs.setValue(orig)
 
 
 # vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78: