recommit 33c336af346dc08b4f4f4951dd6eae7150cef481 po file per plugin

[user/henk/code/ruby/rbot.git] / lib / rbot / load-gettext.rb

diff --git a/lib/rbot/load-gettext.rb b/lib/rbot/load-gettext.rb
index 6d73929657b30ac62bdf0c5335210bd77f2a1cfd..4edc45c8e53af1299e56600adbb6432455c953d4 100644 (file)
--- a/lib/rbot/load-gettext.rb
+++ b/lib/rbot/load-gettext.rb
@@ -34,7 +34,8 @@ begin
       alias :orig_bound_targets :bound_targets
     end
     def bound_targets(*a)  # :nodoc:
-      orig_bound_targets(*a) rescue orig_bound_targets(Object)
+      bt = orig_bound_targets(*a) rescue []
+      bt.empty? ? orig_bound_targets(Object) : bt
     end
 
     require 'stringio'
@@ -59,6 +60,12 @@ begin
 rescue LoadError, GetTextVersionError
   warn "failed to load ruby-gettext package: #{$!}; translations are disabled"
 
+  # undefine GetText, in case it got defined because the error was caused by a
+  # wrong version
+  if defined?(GetText)
+    Object.module_eval { remove_const("GetText") }
+  end
+
   # dummy functions that return msg_id without translation
   def _(s)
     s
@@ -80,6 +87,9 @@ rescue LoadError, GetTextVersionError
     args[0]
   end
 
+  def bindtextdomain_to(*args)
+  end
+
   # the following extension to String#% is from ruby-gettext's string.rb file.
   # it needs to be included in the fallback since the source already use this form