diff options
| author | Jun T <takimoto-j@kba.biglobe.ne.jp> | 2013-11-13 22:30:02 +0900 |
|---|---|---|
| committer | Peter Stephenson <p.w.stephenson@ntlworld.com> | 2013-11-13 19:46:33 +0000 |
| commit | 128034e2118036e3012b9a41520467e257ed263a (patch) | |
| tree | 14922c1f6d3b71e79703957fb40e282e2026c96a | |
| parent | 299738c056105634c4f891076832a1506a38aa18 (diff) | |
| download | zsh-128034e2118036e3012b9a41520467e257ed263a.tar.gz zsh-128034e2118036e3012b9a41520467e257ed263a.tar.xz zsh-128034e2118036e3012b9a41520467e257ed263a.zip | |
31971: locale fix for helpfiles
| -rw-r--r-- | ChangeLog | 2 | ||||
| -rwxr-xr-x | Util/helpfiles | 10 |
2 files changed, 7 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog index 5533c5c7c..18538a5a1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,7 @@ 2013-11-13 Peter Stephenson <p.w.stephenson@ntlworld.com> + * Jun T.: 31971: locale fix for helpfiles. + * Martin Vaeth: 31959: .gitignore, Doc/help/.cvsignore, Doc/help/.distfiles: missed files. diff --git a/Util/helpfiles b/Util/helpfiles index ba1c50a38..3e3125e14 100755 --- a/Util/helpfiles +++ b/Util/helpfiles @@ -56,11 +56,11 @@ sub Die { delete($ENV{'LC_ALL'}); $ENV{'LANG'} = 'C'; if($ARGV[0] =~ /-f(.*)/) { - $lc_type = $1; + $lc_ctype = $1; shift(@ARGV); &Usage() unless(@ARGV); - if($lc_type eq '') { - $lc_type = shift(@ARGV); + if($lc_ctype eq '') { + $lc_ctype = shift(@ARGV); &Usage() unless(@ARGV); } } else { @@ -68,10 +68,10 @@ if($ARGV[0] =~ /-f(.*)/) { $lc_ctype = ''; $choice = 0; while(<LOCALE>) { - if(/en.*utf8/i) { + if(/en.*utf-?8/i) { $lc_ctype = $_; last; - } elsif(/utf8/i) { + } elsif(/utf-?8/i) { $lc_ctype = $_; $choice = 2; } elsif(($choice < 1) && (/(en)|\./i)) { |