diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | lib/irb/locale.rb | 3 |
2 files changed, 8 insertions, 1 deletions
@@ -1,3 +1,9 @@ +Sat Dec 20 10:59:16 2008 Yuki Sonoda (Yugui) <yugui@yugui.jp> + + * lib/irb/locale.rb (IRB::Locale#initialize) + initializes instance variables to suppress warnings. + typo fix to ignore LoadError: [ruby-dev:37508] + Fri Dec 19 17:01:35 2008 Yukihiro Matsumoto <matz@ruby-lang.org> * io.c (rb_io_extract_encoding_option): "internal_encoding: nil" diff --git a/lib/irb/locale.rb b/lib/irb/locale.rb index d36cc5a805..d4e2a0244a 100644 --- a/lib/irb/locale.rb +++ b/lib/irb/locale.rb @@ -29,12 +29,13 @@ module IRB @@legacy_encoding_alias_map = {}.freeze def initialize(locale = nil) + @lang = @territory = @encoding_name = @modifier = nil @locale = locale || ENV["IRB_LANG"] || ENV["LC_MESSAGES"] || ENV["LC_ALL"] || ENV["LANG"] || "C" if m = LOCALE_NAME_RE.match(@locale) @lang, @territory, @encoding_name, @modifier = m[:language], m[:territory], m[:codeset], m[:modifier] if @encoding_name - begin; load 'irb/encoding_aliases.rb' rescue LoadError; end + begin load 'irb/encoding_aliases.rb'; rescue LoadError; end if @encoding = @@legacy_encoding_alias_map[@encoding_name] warn "%s is obsolete. use %s" % ["#{@lang}_#{@territory}.#{@encoding_name}", "#{@lang}_#{@territory}.#{@encoding.name}"] end |