From: Mike FABIAN <mfabian@redhat.com>
Date: Fri, 27 Oct 2017 08:53:35 +0000 (+0200)
Subject: Fix all remaining issues of [BZ #15260]
X-Git-Tag: glibc-2.27~586
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1e5971ec1452784d6cb59539442d92b7020378d5;p=thirdparty%2Fglibc.git

Fix all remaining issues of [BZ #15260]

	[BZ #15260]
	* localedata/locales/doi_IN (LC_MESSAGES): Match only for the
	first letters of yesstr and nostr in yesexpr and noexpr,
	not for the full words.
	* localedata/locales/hne_IN (LC_MESSAGES): Likewise.
	* localedata/locales/kok_IN (LC_MESSAGES): Likewise.
	* localedata/locales/mr_IN (LC_MESSAGES): Likewise.
	* localedata/locales/sat_IN (LC_MESSAGES): Likewise.
	* localedata/locales/km_KH (LC_MESSAGES): Match also for the
	first letters of yesstr and nostr in yesexpr and noexpr,
	until now only English was matched in yesexpr and noexpr.
	* localedata/locales/tl_PH (LC_MESSAGES): Use “copy "fil_PH"”
	instead of “copy "en_US"”. CLDR has yesstr and nostr data for
	fil but not for tl. As tl and fil are very similar, using fil
	is probably better than using English.
---

diff --git a/ChangeLog b/ChangeLog
index 4caaf0d5d0f..72521925ae2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,21 @@
+2017-10-27  Mike FABIAN  <mfabian@redhat.com>
+
+	[BZ #15260]
+	* localedata/locales/doi_IN (LC_MESSAGES): Match only for the
+	first letters of yesstr and nostr in yesexpr and noexpr,
+	not for the full words.
+	* localedata/locales/hne_IN (LC_MESSAGES): Likewise.
+	* localedata/locales/kok_IN (LC_MESSAGES): Likewise.
+	* localedata/locales/mr_IN (LC_MESSAGES): Likewise.
+	* localedata/locales/sat_IN (LC_MESSAGES): Likewise.
+	* localedata/locales/km_KH (LC_MESSAGES): Match also for the
+	first letters of yesstr and nostr in yesexpr and noexpr,
+	until now only English was matched in yesexpr and noexpr.
+	* localedata/locales/tl_PH (LC_MESSAGES): Use “copy "fil_PH"”
+	instead of “copy "en_US"”. CLDR has yesstr and nostr data for
+	fil but not for tl. As tl and fil are very similar, using fil
+	is probably better than using English.
+
 2017-10-27  Thierry Vignaud <thierry.vignaud@gmail.com>
 
 	[BZ #21706]
diff --git a/localedata/locales/doi_IN b/localedata/locales/doi_IN
index db215bc7dd8..dc057ffb906 100644
--- a/localedata/locales/doi_IN
+++ b/localedata/locales/doi_IN
@@ -136,8 +136,8 @@ END LC_TIME
 
 
 LC_MESSAGES
-yesexpr "^(<U0911><U0939>|[+1yY])"
-noexpr  "^(<U0928><U093E>|[-0nN])"
+yesexpr "^[+1yY<U0911>]"
+noexpr  "^[-0nN<U0928>]"
 yesstr  "<U0911><U0939>"
 nostr   "<U0928><U093E>"
 END LC_MESSAGES
diff --git a/localedata/locales/hne_IN b/localedata/locales/hne_IN
index 163e6a48b2d..4da24ecdd95 100644
--- a/localedata/locales/hne_IN
+++ b/localedata/locales/hne_IN
@@ -134,8 +134,8 @@ END LC_TIME
 
 
 LC_MESSAGES
-yesexpr "^[+1yY<U0939><U0935>]"
-noexpr  "^[-0nN<U0928><U0907>]"
+yesexpr "^[+1yY<U0939>]"
+noexpr  "^[-0nN<U0928>]"
 yesstr  "<U0939><U0935>"
 nostr   "<U0928><U0907>"
 END LC_MESSAGES
diff --git a/localedata/locales/km_KH b/localedata/locales/km_KH
index 55ee279a282..71bb41cd205 100644
--- a/localedata/locales/km_KH
+++ b/localedata/locales/km_KH
@@ -1000,8 +1000,8 @@ week 7;19971130;1
 END LC_TIME
 
 LC_MESSAGES
-yesexpr "^[+1yY]"
-noexpr  "^[-0nN]"
+yesexpr "^[+1yY<U1794>]"
+noexpr  "^[-0nN<U1791>]"
 yesstr  "<U1794><U17B6><U1791><U002F><U1785><U17B6><U179F>"
 nostr   "<U1791><U17C1>"
 END LC_MESSAGES
diff --git a/localedata/locales/kok_IN b/localedata/locales/kok_IN
index a3665705a56..e66a6f60b61 100644
--- a/localedata/locales/kok_IN
+++ b/localedata/locales/kok_IN
@@ -134,8 +134,8 @@ END LC_TIME
 
 
 LC_MESSAGES
-yesexpr "^(<U0939><U092F>|[+1yY])"
-noexpr  "^(<U0928><U094D><U0939><U0940>|[-0nN])"
+yesexpr "^[+1yY<U0939>]"
+noexpr  "^[-0nN<U0928>]"
 yesstr "<U0939><U092F>"
 nostr  "<U0928><U094D><U0939><U0940>"
 END LC_MESSAGES
diff --git a/localedata/locales/mr_IN b/localedata/locales/mr_IN
index 3d10db84dd9..af727cca8c8 100644
--- a/localedata/locales/mr_IN
+++ b/localedata/locales/mr_IN
@@ -157,8 +157,8 @@ END LC_TIME
 
 
 LC_MESSAGES
-yesexpr "^([+1yY]|<U0939><U094B>)"
-noexpr  "^([-0nN]|<U0928><U093E>)"
+yesexpr "^[+1yY<U0939>]"
+noexpr  "^[-0nN<U0928>]"
 yesstr  "<U0939><U094B><U092F>"
 nostr   "<U0928><U093E><U0939><U0940>"
 END LC_MESSAGES
diff --git a/localedata/locales/sat_IN b/localedata/locales/sat_IN
index e460f7471f0..c89c92e85c0 100644
--- a/localedata/locales/sat_IN
+++ b/localedata/locales/sat_IN
@@ -136,8 +136,8 @@ END LC_TIME
 
 
 LC_MESSAGES
-yesexpr "^(<U0939><U094B><U092F>|[+1yY])"
-noexpr  "^(<U092C><U093E><U0919>|[-0nN])"
+yesexpr "^[+1yY<U0939>]"
+noexpr  "^[-0nN<U092C>]"
 yesstr  "<U0939><U094B><U092F>"
 nostr   "<U092C><U093E><U0919>"
 END LC_MESSAGES
diff --git a/localedata/locales/tl_PH b/localedata/locales/tl_PH
index 046e52f9352..16271bea2b2 100644
--- a/localedata/locales/tl_PH
+++ b/localedata/locales/tl_PH
@@ -143,7 +143,7 @@ week 7;19971130;1
 END LC_TIME
 
 LC_MESSAGES
-copy "en_US"
+copy "fil_PH"
 END LC_MESSAGES
 
 LC_PAPER