summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-02-18 04:07:56 +0000
committerakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-02-18 04:07:56 +0000
commita03c7923b2d639c80e22d5483251ed7459f451bc (patch)
treec6f63ab3675bf275119ee293f214c9384273b370
parentdf886c394905e90682705f7e5a221024dbedcc06 (diff)
downloadruby-a03c7923b2d639c80e22d5483251ed7459f451bc.tar.gz
ruby-a03c7923b2d639c80e22d5483251ed7459f451bc.tar.xz
ruby-a03c7923b2d639c80e22d5483251ed7459f451bc.zip
* lib/irb/locale.rb (IRB::Locale#lc2kconv): check ja_JP.EUC-JP as well.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@15536 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--lib/irb/locale.rb2
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index c7cede049..7efab002b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Mon Feb 18 13:06:37 2008 Tanaka Akira <akr@fsij.org>
+
+ * lib/irb/locale.rb (IRB::Locale#lc2kconv): check ja_JP.EUC-JP as well.
+
Mon Feb 18 11:51:19 2008 Tanaka Akira <akr@fsij.org>
* re.c (re_warn): defined to restore warnings for /[a-c-e]/, etc.
diff --git a/lib/irb/locale.rb b/lib/irb/locale.rb
index 4b8c4d230..855be3105 100644
--- a/lib/irb/locale.rb
+++ b/lib/irb/locale.rb
@@ -26,7 +26,7 @@ module IRB
def lc2kconv(lang)
case lang
- when "ja_JP.ujis", "ja_JP.euc", "ja_JP.eucJP"
+ when "ja_JP.ujis", "ja_JP.euc", "ja_JP.eucJP", "ja_JP.EUC-JP"
Kconv::EUC
when "ja_JP.sjis", "ja_JP.SJIS"
Kconv::SJIS