From 128034e2118036e3012b9a41520467e257ed263a Mon Sep 17 00:00:00 2001
From: Jun T <takimoto-j@kba.biglobe.ne.jp>
Date: Wed, 13 Nov 2013 22:30:02 +0900
Subject: 31971: locale fix for helpfiles

---
 ChangeLog      |  2 ++
 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)) {
-- 
cgit 1.4.1