quiz: stop quizzes and timers on cleanup

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

diff --git a/data/rbot/plugins/translator.rb b/data/rbot/plugins/translator.rb
index c4eaac4ff80c7cdcd1c414183efe89467d287220..933969a1a7f1aa62ffb388fefcf41f5a96443309 100644 (file)
--- a/data/rbot/plugins/translator.rb
+++ b/data/rbot/plugins/translator.rb
@@ -382,7 +382,7 @@ class TranslatorPlugin < Plugin
     translator = @default_translators.find {|t| @translators[t].support?(params[:from], params[:to])}
 
     if translator
-      cmd_translate m, params.merge({:translator => translator, :show_provider => true})
+      cmd_translate m, params.merge({:translator => translator, :show_provider => false})
     else
       # When translate command is used without source language, "auto" as source
       # language is assumed. It means that google translator is used and we let google
@@ -453,10 +453,10 @@ end
 plugin = TranslatorPlugin.new
 req = Hash[*%w(from to).map { |e| [e.to_sym, /#{plugin.languages.join("|")}/] }.flatten]
 
-plugin.map 'translate [:from] [:to] *url',
-           :action => :cmd_translate_url, :requirements => req.merge(:url => %r{^https?://.*})
-plugin.map 'translator [:from] [:to] *url',
-           :action => :cmd_translate_url, :requirements => req.merge(:url => %r{^https?://.*})
+plugin.map 'translate [:from] [:to] :url',
+           :action => :cmd_translate_url, :requirements => req.merge(:url => %r{^https?://[^\s]*})
+plugin.map 'translator [:from] [:to] :url',
+           :action => :cmd_translate_url, :requirements => req.merge(:url => %r{^https?://[^\s]*})
 plugin.map 'translate [:from] [:to] *phrase',
            :action => :cmd_translator, :thread => true, :requirements => req
 plugin.map 'translator [:from] [:to] *phrase',