From 3342d4b9a510655d320590f7333f616355d0201d Mon Sep 17 00:00:00 2001 From: Giuseppe Bilotta Date: Sat, 14 Jul 2012 13:24:33 +0200 Subject: [PATCH] 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. --- lib/rbot/load-gettext.rb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) 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 -- 2.39.2