fix: gettext updated each_textdomain > each_text_domains

[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 ba9b09babb8687fd4ecddf669ffdc372e0dcac9d..6377b88232fb2d7d5eea7d4d25c94615f8a0c736 100644 (file)
--- a/lib/rbot/load-gettext.rb
+++ b/lib/rbot/load-gettext.rb
@@ -29,7 +29,11 @@ end
 
   include GetText
 
-  rbot_locale_path = File.join(Irc::Bot::Config.datadir, "../locale/%{locale}/LC_MESSAGES/%{name}.mo")
+  rbot_locale_path = File.join(Irc::Bot::Config.datadir,
+    gettext_version < [2, 2, 0] ?
+      "../locale/%{locale}/LC_MESSAGES/%{name}.mo" :
+      "../locale/%{lang}/LC_MESSAGES/%{name}.mo")
+
   if gettext_version < [2, 0, 0]
     add_default_locale_path(rbot_locale_path)
   else
@@ -97,7 +101,7 @@ end
         opts = {:with_messages => false, :with_paths => false, :out => STDOUT}.merge(options)
         ret = nil
         # this is for 2.1.0
-        TextDomainManager.each_textdomains(self) {|textdomain, lang|
+        TextDomainManager.each_text_domains(self) {|textdomain, lang|
           opts[:out].puts "TextDomain name: #{textdomain.name.inspect}"
           opts[:out].puts "TextDomain current locale: #{lang.to_s.inspect}"
           opts[:out].puts "TextDomain current mo path: #{textdomain.instance_variable_get(:@locale_path).current_path(lang).inspect}"