From 024a1d1b2545995d002d4d9f70eb167741c12d9e Mon Sep 17 00:00:00 2001 From: yugui Date: Sat, 20 Dec 2008 02:02:48 +0000 Subject: merges r20887 from trunk into ruby_1_9_1. * lib/irb/locale.rb (IRB::Locale#initialize) initializes instance variables to suppress warnings. typo fix to ignore LoadError: [ruby-dev:37508] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@20889 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- lib/irb/locale.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'lib/irb') 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 -- cgit v1.2.3