do not crash when GetText.cached= is not defined

[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 dd9961f5fbe4f7a2a397a28d043df407441c6545..3eb7c30f9787d4e0e93d5c7a820c56b9b53705eb 100644 (file)
--- a/lib/rbot/load-gettext.rb
+++ b/lib/rbot/load-gettext.rb
@@ -13,9 +13,9 @@ begin
   require 'gettext/version'
 
   gettext_version = GetText::VERSION.split('.').map {|n| n.to_i}
-  include Comparable # required for Array#between?
-  unless gettext_version.between? [1, 8, 0], [1, 10, 0]
-    raise GetTextVersionError, "Unsupported ruby-gettext version installed: #{gettext_version.join '.'}; supported versions are 1.8.0-1.10.0"
+  include Comparable # for Array#>=
+  unless gettext_version >= [1, 8, 0]
+    raise GetTextVersionError, "Unsupported ruby-gettext version installed: #{gettext_version.join '.'}; supported versions are 1.8.0 and above"
   end
 
   require 'gettext'
@@ -24,6 +24,11 @@ begin
 
   add_default_locale_path(File.join(Irc::Bot::Config.datadir, "../locale/%{locale}/LC_MESSAGES/%{name}.mo"))
 
+  if GetText.respond_to? :cached=
+    GetText.cached = false
+  else
+    warning 'This version of ruby-gettext does not support non-cached mode; mo files are not reloaded when setting language'
+  end
   bindtextdomain 'rbot'
 
   module GetText
@@ -34,7 +39,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'
@@ -57,7 +63,13 @@ begin
   log "gettext loaded"
 
 rescue LoadError, GetTextVersionError
-  warn "failed to load ruby-gettext package: #{$!}; translations are disabled"
+  warning "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)
@@ -80,6 +92,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