X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=lib%2Frbot%2Fload-gettext.rb;h=e6c605d92c60f9aa71a21dc6e247e38859d3b446;hb=c986bc82f4b856818e97e24fbf5fc11eef5f25c2;hp=c7c45cf53236ca3eb1daf64e74de24b6fb081a90;hpb=fe554ac10e0a455141cbf51ea17861ac4bcc5720;p=user%2Fhenk%2Fcode%2Fruby%2Frbot.git

diff --git a/lib/rbot/load-gettext.rb b/lib/rbot/load-gettext.rb
index c7c45cf5..e6c605d9 100644
--- a/lib/rbot/load-gettext.rb
+++ b/lib/rbot/load-gettext.rb
@@ -1,36 +1,61 @@
-# load gettext module and provide fallback in case of failure
-
-require 'stringio'
+#-- vim:sw=2:et
+#++
+#
+# :title: GetText interface for rbot
+#
+# Load gettext module and provide fallback in case of failure
+
+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
     def bound_targets(*a)  # :nodoc:
       orig_bound_targets(*a) rescue orig_bound_targets(Object)
     end
-  end
 
-  begin
-    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."
+    require 'stringio'
+
+    # This method is used to output debug information on the GetText
+    # textdomain, and it's called by the language setting routines
+    # in rbot
+    def rbot_gettext_debug
+      begin
+        gettext_info = StringIO.new
+        current_textdomain_info(:out => gettext_info) # fails sometimes
+      rescue Exception
+        warning "gettext failed to set call textdomain info. maybe an mo file doesn't exist for your locale."
+      ensure
+        gettext_info.string.each_line { |l| debug l}
+      end
+    end
   end
 
-rescue LoadError
-  warn 'ruby-gettext package not available; translations are disabled'
+  log "gettext loaded"
+
+rescue LoadError, GetTextVersionError
+  warn "failed to load ruby-gettext package: #{$!}; translations are disabled"
 
   # dummy functions that return msg_id without translation
   def _(s)