X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=lib%2Frbot%2Fload-gettext.rb;h=3eb7c30f9787d4e0e93d5c7a820c56b9b53705eb;hb=cb32e392b722c3c84f6c49fccfc0ea00192ac17b;hp=9798fd60de5808cbd787c8ab8bad63ea9392cc1c;hpb=e6d03d684ea66a6157c159cf1c233bef27e49407;p=user%2Fhenk%2Fcode%2Fruby%2Frbot.git

diff --git a/lib/rbot/load-gettext.rb b/lib/rbot/load-gettext.rb
index 9798fd60..3eb7c30f 100644
--- a/lib/rbot/load-gettext.rb
+++ b/lib/rbot/load-gettext.rb
@@ -13,15 +13,22 @@ 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'
 
   include GetText
 
+  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
@@ -32,23 +39,37 @@ 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
-  end
 
-  begin
     require 'stringio'
-    gettext_info = StringIO.new
-    current_textdomain_info(:out => gettext_info) # fails sometimes
-    debug 'using ruby-gettext'
-  rescue Exception
-    warn "ruby-gettext was loaded but appears to be non-functional. maybe an mo file doesn't exist for your locale."
-  ensure
-    gettext_info.string.each_line { |l| debug l}
+
+    # 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
 
+  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)
@@ -71,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