botuser.rb: don't fail when being passed nil instead of an array to load

[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 165a81c581bbba5d4fe9fa26f7808deb3fc1b32a..1d7cb88b3b6f505175a8986dd7b4c34e75dc2ae1 100644 (file)
--- a/lib/rbot/load-gettext.rb
+++ b/lib/rbot/load-gettext.rb
@@ -1,17 +1,28 @@
 # load gettext module and provide fallback in case of failure
 
-require 'stringio'
+class GetTextVersionError < Exception
+end
 
 # try to load gettext, or provide fake getttext functions
 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"
+  end
+
   require 'gettext'
+
   include GetText
+
   bindtextdomain 'rbot'
 
   module GetText
-    # patch for ruby-gettext 1.9.0 to cope with anonymous modules used by rbot
+    # patch for ruby-gettext 1.8.0 up to 1.10.0 (and more?) to cope with anonymous
+    # modules used by rbot
     # FIXME remove the patch when ruby-gettext is fixed, or rbot switches to named modules
-  # fix for module names that are not constant names
     if !instance_methods.include?('orig_bound_targets')
       alias :orig_bound_targets :bound_targets
     end
@@ -21,15 +32,17 @@ begin
   end
 
   begin
+    require 'stringio'
     gettext_info = StringIO.new
     current_textdomain_info(:out=>gettext_info) # fails sometimes
     debug 'using ruby-gettext'
     gettext_info.string.each_line {|l| debug l}
   rescue Exception
+    warn "ruby-gettext was loaded but appears to be non-functional. maybe an mo file doesn't exist for your locale."
   end
 
-rescue LoadError
-  warn 'ruby-gettext package not available; translations are disabled'
+rescue LoadError, GetTextVersionError
+  warn "failed to load ruby-gettext package: #{$!}; translations are disabled"
 
   # dummy functions that return msg_id without translation
   def _(s)
@@ -44,6 +57,10 @@ rescue LoadError
     n > 1 ? s_plural : s_single
   end
 
+  def Nn_(s_single, s_plural)
+    n_(s_single, s_plural)
+  end
+
   def s_(*args)
     args[0]
   end