more babelfish cleanup

[infobot.git] / src / CommandStubs.pl

diff --git a/src/CommandStubs.pl b/src/CommandStubs.pl
index ec45ff7ef406f78e6a11657ab5609e7b4f437f7b..a4746fb717b962a9e2acc549eba43dacab36a094 100644 (file)
--- a/src/CommandStubs.pl
+++ b/src/CommandStubs.pl
@@ -7,14 +7,13 @@
 # use strict;
 
 use vars qw($who $msgType $conn $chan $message $ident $talkchannel
-       $bot_version $babel_lang_regex $bot_data_dir);
+       $bot_version $bot_data_dir);
 use vars qw(@vernick @vernicktodo);
 use vars qw(%channels %cache %mask %userstats %myModules %cmdstats
        %hooks_extra %lang %ver);
 # FIX THE FOLLOWING:
 use vars qw($total $x $type $i $good);
 
-$babel_lang_regex = "de|ge|gr|el|sp|es|en|fr|it|ja|jp|ko|kr|nl|po|pt|ru|zh|zt";
 $w3search_regex   = "google";
 
 ### COMMAND HOOK IMPLEMENTATION.
@@ -266,6 +265,9 @@ sub parseCmdHook {
 &addCmdHook("extra", 'page', ('CODEREF' => 'pager::page',
        'Identifier' => 'pager', 'Cmdstats' => 'pager',
        'Forker' => 1, 'Help' => 'page') );
+&addCmdHook("extra", '?:babel(?:fish)?|x|xlate|translate', ('CODEREF' => 'babelfish::babelfish',
+       'Identifier' => 'babelfish', 'Cmdstats' => 'babelfish',
+       'Forker' => 1, 'Help' => 'babelfish') );
 ###
 ### END OF ADDING HOOKS.
 ###
@@ -277,25 +279,6 @@ sub Modules {
        return;
     }
 
-    # babelfish bot: Jonathan Feinberg++
-    if ($message =~ m{
-               ^\s*
-               (?:babel(?:fish)?|x|xlate|translate)
-               \s+
-               ($babel_lang_regex)\w*  # from language?
-               \s+
-               ($babel_lang_regex)\w*  # to language?
-               \s*
-               (.+)                    # The phrase to be translated
-    }xoi) {
-       return unless (&hasParam("babelfish"));
-
-       &Forker("babelfish", sub { &babelfish::babelfish(lc $1, lc $2, $3); } );
-
-       $cmdstats{'BabelFish'}++;
-       return;
-    }
-
     my $debiancmd       = 'conflicts?|depends?|desc|file|(?:d)?info|provides?';
     $debiancmd         .= '|recommends?|suggests?|maint|maintainer';