Survive active_support idiocy

[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 505a28bc4aec7442c80ed8eae1f177b7d1d3b3c4..b896557b18a26b38624a4b1cce023473fdb0f1b3 100644 (file)
--- a/lib/rbot/load-gettext.rb
+++ b/lib/rbot/load-gettext.rb
@@ -10,6 +10,11 @@ end
 
 # try to load gettext, or provide fake getttext functions
 begin
+# workaround for gettext not checking empty LANGUAGE
+if ENV["LANGUAGE"] and ENV["LANGUAGE"].empty?
+  ENV.delete "LANGUAGE"
+end
+
   require 'gettext/version'
 
   gettext_version = GetText::VERSION.split('.').map {|n| n.to_i}
@@ -42,7 +47,7 @@ begin
     # patch for ruby-gettext 1.x to cope with anonymous modules used by rbot.
     # bound_targets and related methods are not used nor present in 2.x, and
     # this patch is not needed
-    if instance_methods.include?('bound_targets') and not instance_methods.include?('orig_bound_targets')
+    if respond_to? :bound_targets, true
       alias :orig_bound_targets :bound_targets
 
       def bound_targets(*a)  # :nodoc: