mirrors/zsh
1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2025-10-31 06:00:54 +01:00
Code Releases Activity

31971: locale fix for helpfiles

Browse source
This commit is contained in:
Jun T 2013-11-13 22:30:02 +09:00 • committed by Peter Stephenson
parent 299738c056
commit 128034e211
2 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
ChangeLog
View file

@ -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.

10
Util/helpfiles
View file

@ -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)) {