X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=lib%2Frbot%2Fload-gettext.rb;h=e95d406837ccecceee52d43af7dcc1f792c4fef1;hb=4a86158144a13bc901222442ccd2db9c2bbd6bb0;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..e95d4068 100644
--- a/lib/rbot/load-gettext.rb
+++ b/lib/rbot/load-gettext.rb
@@ -22,6 +22,8 @@ begin
 
   include GetText
 
+  add_default_locale_path(File.join(Irc::Config.datadir, "../locale/%{locale}/LC_MESSAGES/%{name}.mo"))
+
   bindtextdomain 'rbot'
 
   module GetText
@@ -34,19 +36,26 @@ begin
     def bound_targets(*a)  # :nodoc:
       orig_bound_targets(*a) rescue orig_bound_targets(Object)
     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"