about summary refs log tree commit diff
diff options
context:
space:
mode:
authorMikael Magnusson <mikachu@gmail.com>2017-01-24 12:01:57 +0100
committerMikael Magnusson <mikachu@gmail.com>2017-01-24 16:22:39 +0100
commit0e33ebc6514c8719513f3f20161274f6af2caffc (patch)
tree232dc5fa220c16cefe77b0e93e26d29d0b15a31f
parent3e5badb0c909d2b192552c2385dd1188e6efd36e (diff)
downloadzsh-0e33ebc6514c8719513f3f20161274f6af2caffc.tar.gz
zsh-0e33ebc6514c8719513f3f20161274f6af2caffc.tar.xz
zsh-0e33ebc6514c8719513f3f20161274f6af2caffc.zip
posted: Make D07 recognize more spellings of pl_PL.UTF-8
FreeBSD and probably others use this spelling in locale -a output, while
glibc uses the utf8 spelling.
-rw-r--r--ChangeLog5
-rw-r--r--Test/D07multibyte.ztst4
2 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 2845886cb..833cc1506 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2017-01-24  Mikael Magnusson  <mikachu@gmail.com>
+
+	* posted: Test/D07multibyte.ztst: Make D07 recognize more
+	spellings of pl_PL.UTF-8
+
 2017-01-24  Peter Stephenson  <p.stephenson@samsung.com>
 
 	* 40404: Src/builtin.c: quoting of commands in whence should
diff --git a/Test/D07multibyte.ztst b/Test/D07multibyte.ztst
index d5a15ef04..0ff65c707 100644
--- a/Test/D07multibyte.ztst
+++ b/Test/D07multibyte.ztst
@@ -549,9 +549,9 @@
     "↓"
   }
   : $functions)
-0:Multibtye handling of functions parameter
+0:Multibyte handling of functions parameter
 
-  if [[ -n ${$(locale -a 2>/dev/null)[(R)pl_PL.utf8]} ]]; then
+  if [[ -n ${$(locale -a 2>/dev/null)[(R)pl_PL.(utf8|UTF-8)]} ]]; then
   (
     export LC_ALL=pl_PL.UTF-8
     local -a names=(a b c d e f $'\u0105' $'\u0107' $'\u0119')