fix httputil.rb when using proxy (Ticket #80)

[user/henk/code/ruby/rbot.git] / lib / rbot / language.rb

diff --git a/lib/rbot/language.rb b/lib/rbot/language.rb
index d48607b83bef5dd4636bffa3fd9244a4da316f77..1a4a889aadc206acff56e83aa92c2f58023e42db 100644 (file)
--- a/lib/rbot/language.rb
+++ b/lib/rbot/language.rb
@@ -1,11 +1,14 @@
 module Irc
+module Language
 
   class Language
     BotConfig.register BotConfigEnumValue.new('core.language', 
       :default => "english", :wizard => true,
-      :values => Dir.new(Config::DATADIR + "/languages").collect {|f|
-                   f =~ /\.lang$/ ? f.gsub(/\.lang$/, "") : nil
-                 }.compact,   
+      :values => Proc.new{|bot|
+            Dir.new(Config::datadir + "/languages").collect {|f|
+              f =~ /\.lang$/ ? f.gsub(/\.lang$/, "") : nil
+            }.compact
+          },   
       :on_change => Proc.new {|bot, v| bot.lang.set_language v},
       :desc => "Which language file the bot should use")
     
@@ -14,7 +17,7 @@ module Irc
     end
 
     def set_language(language)
-      file = Config::DATADIR + "/languages/#{language}.lang"
+      file = Config::datadir + "/languages/#{language}.lang"
       unless(FileTest.exist?(file))
         raise "no such language: #{language} (no such file #{file})"
       end
@@ -63,3 +66,4 @@ module Irc
   end
 
 end
+end