weather plugin: refactor HTML cleanup code

[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 c2b74eeb370260e73e548c870c06a635b4f18554..2150fcb2844bfa985112015ed968dac63d85dc25 100644 (file)
--- a/data/rbot/plugins/translator.rb
+++ b/data/rbot/plugins/translator.rb
@@ -8,6 +8,11 @@
 # License:: GPLv2
 #
 # This plugin allows using rbot to translate text on a few translation services
+#
+# TODO
+#
+# * Configuration for whether to show translation engine
+# * Optionally sync default translators with karma.rb ranking
 
 require 'set'
 require 'timeout'
@@ -252,7 +257,7 @@ class WorldlingoTranslator < Translator
 end
 
 class TranslatorPlugin < Plugin
-  BotConfig.register BotConfigIntegerValue.new('translator.timeout',
+  Config.register Config::IntegerValue.new('translator.timeout',
     :default => 30, :validate => Proc.new{|v| v > 0},
     :desc => _("Number of seconds to wait for the translation service before timeout"))
 
@@ -271,14 +276,15 @@ class TranslatorPlugin < Plugin
     TRANSLATORS.each_pair do |name, c|
       begin
         @translators[name] = c.new(@registry.sub_registry(name))
-        map "#{name} :from :to *phrase", :action => :cmd_translate
+        map "#{name} :from :to *phrase",
+          :action => :cmd_translate, :thread => true
       rescue Exception
         warning _("Translator %{name} cannot be used: %{reason}") %
                {:name => name, :reason => $!}
       end
     end
 
-    BotConfig.register BotConfigArrayValue.new('translator.default_list',
+    Config.register Config::ArrayValue.new('translator.default_list',
       :default => TRANSLATORS.keys,
       :validate => Proc.new {|l| l.all? {|t| TRANSLATORS.has_key?(t)}},
       :desc => _("List of translators to try in order when translator name not specified"),
@@ -310,7 +316,7 @@ class TranslatorPlugin < Plugin
     from, to = params[:from], params[:to]
     translator = @default_translators.find {|t| @translators[t].support?(from, to)}
     if translator
-      cmd_translate m, params.merge({:translator => translator})
+      cmd_translate m, params.merge({:translator => translator, :show_provider => true})
     else
       m.reply _('None of the default translators (translator.default_list) supports translating from %{source} to %{target}') % {:source => from, :target => to}
     end
@@ -326,7 +332,13 @@ class TranslatorPlugin < Plugin
         translation = Timeout.timeout(@bot.config['translator.timeout']) do
           translator.translate(phrase, from, to)
         end
-        m.reply translation
+        m.reply(if params[:show_provider]
+                  _('%{translation} (provided by %{translator})') %
+                    {:translation => translation, :translator => tname}
+                else
+                  translation
+                end)
+
       rescue Translator::UnsupportedDirectionError
         m.reply _("%{translator} doesn't support translating from %{source} to %{target}") %
                 {:translator => tname, :source => from, :target => to}
@@ -343,4 +355,5 @@ class TranslatorPlugin < Plugin
 end
 
 plugin = TranslatorPlugin.new
-plugin.map 'translator :from :to *phrase', :action => :cmd_translator
+plugin.map 'translator :from :to *phrase',
+           :action => :cmd_translator, :thread => true