From 06f61f191b9217c2b65f568297c0e76d3e0cce3c Mon Sep 17 00:00:00 2001
From: Mike Frysinger <vapier@gentoo.org>
Date: Tue, 19 Apr 2016 00:00:58 -0400
Subject: [PATCH] localedata: LC_MESSAGES.{yes,no}expr: standardize yY/nN [BZ
 #15262]
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

The vast majority of languages include yY/nN in their yes/no regexes.
Standardize the few that were missing them.
  ms_MY: noexpr: add nN
  nan_TW@latin: yesexpr: add yY
  nan_TW@latin: noexpr: add nN
  se_NO: noexpr: add nN

This also highlighted a few that were incorrectly using yY/nN because
they clashed with their localized messages:
  uz_UZ: yesexpr: change ^[+1YyHh] to ^[+1Ò²Ò³Hh]
  uz_UZ: noexpr: change ^[-0JjNn] to ^[-0ЙйNnYyJj]
  uz_UZ@cyrillic: yesexpr: change ^[+1Ò²Ò³Yy] to ^[+1Ò²Ò³Hh]
  uz_UZ@cyrillic: noexpr: change ^[-0ЙйNn] to [-0ЙйNnYyJj]
  yo_NG: move nN (short for Bẹ́ẹ̀ni) from noexpr to yesexpr
---
 localedata/ChangeLog              | 13 +++++++++++++
 localedata/locales/ms_MY          |  2 +-
 localedata/locales/nan_TW@latin   |  4 ++--
 localedata/locales/se_NO          |  2 +-
 localedata/locales/uz_UZ          |  8 +++++---
 localedata/locales/uz_UZ@cyrillic |  7 +++++--
 localedata/locales/yo_NG          |  4 ++--
 7 files changed, 29 insertions(+), 11 deletions(-)

diff --git a/localedata/ChangeLog b/localedata/ChangeLog
index 05e61eaafa..92636d95a5 100644
--- a/localedata/ChangeLog
+++ b/localedata/ChangeLog
@@ -1,3 +1,16 @@
+2016-04-23  Mike Frysinger  <vapier@gentoo.org>
+
+	[BZ #15262]
+	* locales/ms_MY (LC_MESSAGES): Add nN to noexpr.
+	* locales/nan_TW@latin (LC_MESSAGES): Add nN to noexpr and yY to
+	yesexpr.
+	* locales/se_NO (LC_MESSAGES): Add nN to noexpr.
+	* locales/uz_UZ (LC_MESSAGES): Remove Yy from yesexpr and add Ò²Ò³.
+	* locales/uz_UZ@cyrillic (LC_MESSAGES): Remove Yy from yesexpr and
+	add Hh.  Add YyJj to noexpr.
+	* locales/yo_NG (LC_MESSAGES): Remove nN from noexpr and add nN to
+	yesexpr.
+
 2016-04-23  Mike Frysinger  <vapier@gentoo.org>
 
 	[BZ #15263]
diff --git a/localedata/locales/ms_MY b/localedata/locales/ms_MY
index 3aab747b1e..e6ca8d66aa 100644
--- a/localedata/locales/ms_MY
+++ b/localedata/locales/ms_MY
@@ -153,7 +153,7 @@ END LC_TIME
 
 LC_MESSAGES
 yesexpr "<U005E><U005B><U002B><U0031><U0079><U0059><U005D>"
-noexpr  "<U005E><U005B><U002D><U0030><U0074><U0054><U005D>"
+noexpr  "<U005E><U005B><U002D><U0030><U0074><U0054><U006E><U004E><U005D>"
 yesstr  "<U0059><U0061>"
 nostr   "<U0054><U0069><U0064><U0061><U006B>"
 END LC_MESSAGES
diff --git a/localedata/locales/nan_TW@latin b/localedata/locales/nan_TW@latin
index 8c455d3aa5..5379b23201 100644
--- a/localedata/locales/nan_TW@latin
+++ b/localedata/locales/nan_TW@latin
@@ -145,8 +145,8 @@ week 7;19971130;1
 END LC_TIME
 
 LC_MESSAGES
-yesexpr "<U005E><U005B><U002B><U0031><U0073><U0053><U005D>"
-noexpr  "<U005E><U005B><U002D><U0030><U006D><U004D><U005D>"
+yesexpr "<U005E><U005B><U002B><U0031><U0079><U0059><U0073><U0053><U005D>"
+noexpr  "<U005E><U005B><U002D><U0030><U006E><U004E><U006D><U004D><U005D>"
 yesstr  "<U0053><U012B>"
 nostr   "<U004D><U0304><U002D><U0053><U012B>"
 END LC_MESSAGES
diff --git a/localedata/locales/se_NO b/localedata/locales/se_NO
index 029c67dcc5..72d653170d 100644
--- a/localedata/locales/se_NO
+++ b/localedata/locales/se_NO
@@ -286,7 +286,7 @@ END LC_TIME
 
 LC_MESSAGES
 yesexpr "<U005E><U005B><U002B><U0031><U004A><U006A><U0059><U0079><U005D>"
-noexpr  "<U005E><U005B><U002D><U0030><U0049><U0069><U005D>"
+noexpr  "<U005E><U005B><U002D><U0030><U0049><U0069><U004E><U006E><U005D>"
 END LC_MESSAGES
 
 
diff --git a/localedata/locales/uz_UZ b/localedata/locales/uz_UZ
index 5aa79a0118..e75f70f94b 100644
--- a/localedata/locales/uz_UZ
+++ b/localedata/locales/uz_UZ
@@ -269,9 +269,11 @@ first_weekday 2
 END LC_TIME
 
 LC_MESSAGES
-% NOTE: No is "yo'q"; that conflicts with English "yes"... so "jo'q" is used.
-yesexpr "<U005E><U005B><U002B><U0031><U0059><U0079><U0048><U0068><U005D>"
-noexpr  "<U005E><U005B><U002D><U0030><U004A><U006A><U004E><U006E><U005D>"
+% Note: "No" is "yo‘q" which conflicts with English "yes".
+% This is why "jo‘q" & "jJ" is also accepted as "no".
+yesexpr "<U005E><U005B><U002B><U0031><U04B2><U04B3><U0048><U0068><U005D>"
+noexpr  "<U005E><U005B><U002D><U0030><U0419><U0439><U004E><U006E><U0059>/
+<U0079><U004A><U006A><U005D>"
 yesstr  "<U0048><U0061>"
 nostr   "<U0059><U006F><U0027><U0071>"
 END LC_MESSAGES
diff --git a/localedata/locales/uz_UZ@cyrillic b/localedata/locales/uz_UZ@cyrillic
index 93db5a1202..6cf5cc16b7 100644
--- a/localedata/locales/uz_UZ@cyrillic
+++ b/localedata/locales/uz_UZ@cyrillic
@@ -272,8 +272,11 @@ first_weekday 2
 END LC_TIME
 
 LC_MESSAGES
-yesexpr "<U005E><U005B><U002B><U0031><U04B2><U04B3><U0059><U0079><U005D>"
-noexpr  "<U005E><U005B><U002D><U0030><U0419><U0439><U004E><U006E><U005D>"
+% Note: "No" is "yo‘q" which conflicts with English "yes".
+% This is why "jo‘q" & "jJ" is also accepted as "no".
+yesexpr "<U005E><U005B><U002B><U0031><U04B2><U04B3><U0048><U0068><U005D>"
+noexpr  "<U005E><U005B><U002D><U0030><U0419><U0439><U004E><U006E><U0059>/
+<U0079><U004A><U006A><U005D>"
 yesstr  "<U04B2><U0430>"
 nostr   "<U0419><U045E><U049B>"
 END LC_MESSAGES
diff --git a/localedata/locales/yo_NG b/localedata/locales/yo_NG
index 4378c7bb0e..76a3ac7328 100644
--- a/localedata/locales/yo_NG
+++ b/localedata/locales/yo_NG
@@ -421,8 +421,8 @@ first_weekday 2
 END LC_TIME
 
 LC_MESSAGES
-yesexpr "<U005E><U005B><U002B><U0031><U0045><U0065><U0079><U0059><U005D>"
-noexpr  "<U005E><U005B><U002D><U0030><U0072><U0052><U004F><U006F><U004B><U006B><U004E><U006E><U005D>"
+yesexpr "<U005E><U005B><U002B><U0031><U0045><U0065><U0079><U0059><U004E><U006E><U005D>"
+noexpr  "<U005E><U005B><U002D><U0030><U0072><U0052><U004F><U006F><U004B><U006B><U005D>"
 yesstr  "<U0042><U1EB9><U0301><U1EB9><U0300><U0020><U006E><U0069>"
 nostr   "<U0042><U1EB9><U0301><U1EB9><U0300><U0020><U006B><U1ECD><U0301>"
 END LC_MESSAGES
-- 
2.43.5