diff options
| author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2003-07-24 05:18:47 +0000 |
|---|---|---|
| committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2003-07-24 05:18:47 +0000 |
| commit | e02b469de182c1d87ead38fa82630eaaee75c379 (patch) | |
| tree | 425980c3ebfb78d38067b3b01f2df97a9dc0853d /lib/irb | |
| parent | 169300a4f8f6c704d9ef1dbed0b73f2dd7efdb68 (diff) | |
* eval.c (thgroup_add): no warning for terminated threads.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@4142 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/irb')
| -rw-r--r-- | lib/irb/locale.rb | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/lib/irb/locale.rb b/lib/irb/locale.rb index dad6b2f075..b2c90e38e2 100644 --- a/lib/irb/locale.rb +++ b/lib/irb/locale.rb @@ -21,27 +21,26 @@ module IRB LOCALE_DIR = "/lc/" def initialize(locale = nil) - @lang = locale || ENV["IRB_LANG"] || ENV["LC_MESSAGES"] || ENV["LC_ALL"] || ENV["LANG"] - @lang = "C" unless @lang + @lang = locale || ENV["IRB_LANG"] || ENV["LC_MESSAGES"] || ENV["LC_ALL"] || ENV["LANG"] || "C" end attr_reader :lang - @@LC2KCONV = { - # "ja" => Kconv::JIS, - # "ja_JP" => Kconv::JIS, - "ja_JP.ujis" => Kconv::EUC, - "ja_JP.euc" => Kconv::EUC, - "ja_JP.eucJP" => Kconv::EUC, - "ja_JP.sjis" => Kconv::SJIS, - "ja_JP.SJIS" => Kconv::SJIS, - } + def lc2kconv(lang) + case lang + when "ja_JP.ujis", "ja_JP.euc", "ja_JP.eucJP" + Kconv::EUC + when "ja_JP.sjis", "ja_JP.SJIS" + Kconv::SJIS + end + end + private :lc2kconv def String(mes) mes = super(mes) case @lang when /^ja/ - mes = Kconv::kconv(mes, @@LC2KCONV[@lang]) + mes = Kconv::kconv(mes, lc2kconv(@lang)) else mes end |