X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=data%2Frbot%2Fplugins%2Ftranslator.rb;h=6bd4dc226018ac9650ae2d40e5513a8f22e29164;hb=0f277c32dd269937fbbe6427b416214ae70c70e2;hp=c2b74eeb370260e73e548c870c06a635b4f18554;hpb=06185978eaf9d0eaef5089afb97ae8ca521a41b1;p=user%2Fhenk%2Fcode%2Fruby%2Frbot.git

diff --git a/data/rbot/plugins/translator.rb b/data/rbot/plugins/translator.rb
index c2b74eeb..6bd4dc22 100644
--- 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"),
@@ -287,9 +293,10 @@ class TranslatorPlugin < Plugin
   end
 
   def help(plugin, topic=nil)
-    if @translators.has_key?(topic)
-      translator = @translators[topic]
-      _('%{info}, supported directions of translation: %{directions}') % {
+    if @translators.has_key?(plugin)
+      translator = @translators[plugin]
+      _('%{translator} <from> <to> <phrase> => Look up phrase using %{info}, supported from -> to languages: %{directions}') % {
+        :translator => plugin,
         :info => translator.class::INFO,
         :directions => translator.directions.map do |source, targets|
                          _('%{source} -> %{targets}') %
@@ -297,7 +304,7 @@ class TranslatorPlugin < Plugin
                        end.join(' | ')
       }
     else
-      _('Command: <translator> <from> <to> <phrase>, where <translator> is one of: %{translators}. If "translator" is used in place of the translator name, the first translator in translator.default_list which supports the specified direction will be picked automatically. Use "help translator <translator>" to look up supported from and to languages') %
+      _('Command: <translator> <from> <to> <phrase>, where <translator> is one of: %{translators}. If "translator" is used in place of the translator name, the first translator in translator.default_list which supports the specified direction will be picked automatically. Use "help <translator>" to look up supported from and to languages') %
         {:translators => @translators.keys.join(', ')}
     end
   end
@@ -310,7 +317,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 +333,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 +356,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