keywords plugin: when exporting to factoids, split at ' or '

[user/henk/code/ruby/rbot.git] / data / rbot / plugins / fish.rb

diff --git a/data/rbot/plugins/fish.rb b/data/rbot/plugins/fish.rb
index 140c95704b2cb1a904c1aa7bf0eb034a68453eb5..3bafd03ef44d90f64d4787f41794cad31a6380e9 100644 (file)
--- a/data/rbot/plugins/fish.rb
+++ b/data/rbot/plugins/fish.rb
@@ -1,10 +1,10 @@
 class BabelPlugin < Plugin
   LANGS = %w{en fr de it pt es nl ru zh zt el ja ko}
 
-  BotConfig.register BotConfigEnumValue.new('translate.default_from',
+  Config.register Config::EnumValue.new('translate.default_from',
     :values => LANGS, :default => 'en',
     :desc => "Default language to translate from")
-  BotConfig.register BotConfigEnumValue.new('translate.default_to',
+  Config.register Config::EnumValue.new('translate.default_to',
     :values => LANGS, :default => 'en',
     :desc => "Default language to translate to")
 
@@ -31,7 +31,7 @@ class BabelPlugin < Plugin
       return
     end
 
-    data_text = URI.escape trans_text
+    data_text = CGI.escape trans_text
     trans_pair = "#{trans_from}_#{trans_to}"
 
     if (trans_text =~ /^http:\/\//) && (URI.parse(trans_text) rescue nil)
@@ -110,8 +110,8 @@ plugin = BabelPlugin.new
 
 plugin.default_auth('cache', false)
 
-plugin.map 'translate to :tolang *phrase'
-plugin.map 'translate from :fromlang *phrase'
+plugin.map 'translate to :tolang *phrase', :thread => true
+plugin.map 'translate from :fromlang *phrase', :thread => true
 plugin.map 'translate cache :cmd', :action => :cache_mgmt, :auth_path => 'cache!', :requirements => { :cmd => /view|clear/ }
-plugin.map 'translate :fromlang :tolang *phrase'
+plugin.map 'translate :fromlang :tolang *phrase', :thread => true