From: Giuseppe Bilotta <giuseppe.bilotta@gmail.com>
Date: Sat, 14 Jul 2012 11:24:33 +0000 (+0200)
Subject: Update gettext support
X-Git-Url: https://git.netwichtig.de/gitweb/?a=commitdiff_plain;ds=sidebyside;h=3342d4b9a510655d320590f7333f616355d0201d;p=user%2Fhenk%2Fcode%2Fruby%2Frbot.git

Update gettext support

Somewhere along the line between 2.0.0 and 2.2.1 gettext switched from
locale to lang for the hash key name. Support both.
---

diff --git a/lib/rbot/load-gettext.rb b/lib/rbot/load-gettext.rb
index ba9b09ba..252e1e34 100644
--- 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