mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* lib/irb/locale.rb (IRB::Locale::LOCALE_NAME_RE):
some platoform has a locale without territory but with encoding. (#each_sub_locale): ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30498 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
0c560941f1
commit
b128f7ffcd
2 changed files with 15 additions and 10 deletions
|
@ -1,3 +1,10 @@
|
|||
Sun Jan 9 16:31:34 2011 Yuki Sonoda (Yugui) <yugui@yugui.jp>
|
||||
|
||||
* lib/irb/locale.rb (IRB::Locale::LOCALE_NAME_RE):
|
||||
some platoform has a locale without territory but with
|
||||
encoding.
|
||||
(#each_sub_locale): ditto.
|
||||
|
||||
Sun Jan 9 14:47:50 2011 TAKAO Kouji <kouji@takao7.net>
|
||||
|
||||
* ext/readline/readline.c: apply a patch from Nobuyoshi Nakada.
|
||||
|
|
|
@ -13,16 +13,10 @@ module IRB
|
|||
@RCS_ID='-$Id$-'
|
||||
|
||||
LOCALE_NAME_RE = %r[
|
||||
(?<language>[[:alpha:]]{2})
|
||||
(?:_
|
||||
(?<territory>[[:alpha:]]{2,3})
|
||||
(?:\.
|
||||
(?<codeset>[^@]+)
|
||||
)?
|
||||
)?
|
||||
(?:@
|
||||
(?<modifier>.*)
|
||||
)?
|
||||
(?<language>[[:alpha:]]{2,3})
|
||||
(?:_ (?<territory>[[:alpha:]]{2,3}) )?
|
||||
(?:\. (?<codeset>[^@]+) )?
|
||||
(?:@ (?<modifier>.*) )?
|
||||
]x
|
||||
LOCALE_DIR = "/lc/"
|
||||
|
||||
|
@ -175,6 +169,10 @@ module IRB
|
|||
yield "#{@lang}_#{@territory}@#{@modifier}" if @modifier
|
||||
yield "#{@lang}_#{@territory}"
|
||||
end
|
||||
if @encoding_name
|
||||
yield "#{@lang}.#{@encoding_name}@#{@modifier}" if @modifier
|
||||
yield "#{@lang}.#{@encoding_name}"
|
||||
end
|
||||
yield "#{@lang}@#{@modifier}" if @modifier
|
||||
yield "#{@lang}"
|
||||
end
|
||||
|
|
Loading…
Reference in a new issue