summary refs log tree commit diff
diff options
context:
space:
mode:
authorPeter Stephenson <pws@users.sourceforge.net>2009-04-26 19:43:24 +0000
committerPeter Stephenson <pws@users.sourceforge.net>2009-04-26 19:43:24 +0000
commitf91d89ccf858950d7d79d9472d5bdde46ea4f394 (patch)
tree3ed8415662b010ed20f0d7c7ddec4372097f8f1d
parent7e304940e5abf61362803f53847306f4270a1875 (diff)
downloadzsh-f91d89ccf858950d7d79d9472d5bdde46ea4f394.tar.gz
zsh-f91d89ccf858950d7d79d9472d5bdde46ea4f394.tar.xz
zsh-f91d89ccf858950d7d79d9472d5bdde46ea4f394.zip
Paul Ackersviller: 26883: naming of UTF8 locales on HPUX
-rw-r--r--ChangeLog7
-rw-r--r--Test/D07multibyte.ztst4
2 files changed, 8 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index cc9c2da09..e48682d5d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-04-26  Peter Stephenson  <p.w.stephenson@ntlworld.com>
+
+	* Paul Ackersviller: 26883: Test/D07multibyte.ztst: naming of
+	UTF8 locales is different in HPUX.
+
 2009-04-25  Peter Stephenson  <p.w.stephenson@ntlworld.com>
 
 	* unposted, see 26880: Functions/Misc/run-help: back off 26862.
@@ -11624,5 +11629,5 @@
 
 *****************************************************
 * This is used by the shell to define $ZSH_PATCHLEVEL
-* $Revision: 1.4669 $
+* $Revision: 1.4670 $
 *****************************************************
diff --git a/Test/D07multibyte.ztst b/Test/D07multibyte.ztst
index fb3161d97..ec7def8b7 100644
--- a/Test/D07multibyte.ztst
+++ b/Test/D07multibyte.ztst
@@ -5,8 +5,8 @@
 # Don't let LC_* override our choice of locale.
   unset -m LC_\*
   mb_ok=
-  langs=(en_US.UTF-8 en_GB.UTF-8 en.UTF-8
-	 $(locale -a 2>/dev/null | sed -e 's/utf8/UTF-8/' | grep UTF-8))
+  langs=(en_{US,GB}.{UTF-,utf}8 en.UTF-8
+	 $(locale -a 2>/dev/null | egrep 'utf8|UTF-8'))
   for LANG in $langs; do
     if [[ é = ? ]]; then
       mb_ok=1