From c5527d7ddcfc1fbd7a129679580cf5d5e0b52ff5 Mon Sep 17 00:00:00 2001
From: Mike FABIAN <mfabian@redhat.com>
Date: Thu, 27 Jul 2017 11:04:38 +0200
Subject: [PATCH] Minor improvements to new az_IR locale

	* locales/az_IR (LC_MESSAGES): Improve yesexpr and noexpr.
	* locales/az_IR (LC_ADDRESS): Fix typo in comment  and
	use the individual iso-639-3 code for South Azerbaijani
	"azb" in lang_term.
	* locales/az_IR (LC_NAME): Improve readability of name_fmt in source.
---
 ChangeLog                |  4 ++++
 locale/iso-639.def       |  2 ++
 localedata/ChangeLog     |  8 ++++++++
 localedata/locales/az_IR | 17 +++++++++--------
 4 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 8850e53bc2..d38c2c67bd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2017-07-27  Mike FABIAN  <mfabian@redhat.com>
+
+	* locale/iso-639.def: add North and South Azerbaijani.
+
 2017-07-27  Rical Jasan  <ricaljasan@pacific.net>
 
 	* manual/lang.texi (CHAR_BIT): Convert from an @table to an
diff --git a/locale/iso-639.def b/locale/iso-639.def
index ab70441622..b109a3b823 100644
--- a/locale/iso-639.def
+++ b/locale/iso-639.def
@@ -50,6 +50,8 @@ DEFINE_LANGUAGE_CODE3 ("Aguaruna", agr, agr)
 DEFINE_LANGUAGE_CODE ("Aymara, Southern", ay, ayc, ayc)
 DEFINE_LANGUAGE_CODE ("Aymara", ay, aym, aym)
 DEFINE_LANGUAGE_CODE ("Azerbaijani", az, aze, aze)
+DEFINE_LANGUAGE_CODE ("North Azerbaijani", az, azj, aze)
+DEFINE_LANGUAGE_CODE ("South Azerbaijani", az, azb, aze)
 DEFINE_LANGUAGE_CODE3 ("Balinese", ban, ban)
 DEFINE_LANGUAGE_CODE3 ("Baltic (Other)", bat, bat)
 DEFINE_LANGUAGE_CODE3 ("Baluchi", bal, bal)
diff --git a/localedata/ChangeLog b/localedata/ChangeLog
index 434d1a5e48..34a842181f 100644
--- a/localedata/ChangeLog
+++ b/localedata/ChangeLog
@@ -1,3 +1,11 @@
+2017-07-27  Mike FABIAN  <mfabian@redhat.com>
+
+	* locales/az_IR (LC_MESSAGES): Improve yesexpr and noexpr.
+	* locales/az_IR (LC_ADDRESS): Fix typo in comment  and
+	use the individual iso-639-3 code for South Azerbaijani
+	"azb" in lang_term.
+	* locales/az_IR (LC_NAME): Improve readability of name_fmt in source.
+
 2017-07-27  Mousa Moradi <mousamk@gmail.com>
 
 	[BZ #14172]
diff --git a/localedata/locales/az_IR b/localedata/locales/az_IR
index 44a3fe7d2e..b4dca0e60b 100644
--- a/localedata/locales/az_IR
+++ b/localedata/locales/az_IR
@@ -85,10 +85,10 @@ copy "fa_IR"
 END LC_CTYPE
 
 LC_MESSAGES
-% This is "^[yY<HEH><BEH>].*"
-yesexpr "<U005E><U005B><U0079><U0059><U0647><U0628><U005D><U002E><U002A>"
-% This is "^[nN<YEH><KHEH>].*"
-noexpr  "<U005E><U005B><U006E><U004E><U06CC><U062E><U005D><U002E><U002A>"
+% This is "^[+1yY<HEH><BEH>]"
+yesexpr "<U005E><U005B><U002B><U0031><U0079><U0059><U0647><U0628><U005D>"
+% This is "^[-0nN<YEH><KHEH>]"
+noexpr  "<U005E><U005B><U002D><U0030><U006E><U004E><U06CC><U062E><U005D>"
 % This is "Hen":
 yesstr  "<U0647><U0646>"
 % This is "Yox":
@@ -252,7 +252,7 @@ copy "fa_IR"
 END LC_MEASUREMENT
 
 LC_ADDRESS
-% NOTE: Copied from "fr_IR", it should be checked and reconsidered if necessary:
+% NOTE: Copied from "fa_IR", it should be checked and reconsidered if necessary:
 postal_fmt "<U0025><U0066><U0025><U004E><U0025><U0061><U0025><U004E>/
 <U0025><U0064><U0025><U004E><U0025><U0062><U0025><U004E><U0025><U0073>/
 <U0020><U0025><U0068><U0020><U0025><U0065><U0020><U0025><U0072><U0025>/
@@ -269,7 +269,9 @@ country_isbn "964"
 % Turkce
 lang_name "<U062A><U06C6><U0631><U06A9><U062C><U0647>"
 lang_ab "az"
-lang_term "aze"
+% iso-639-3
+lang_term "azb"
+% iso-639-2
 lang_lib "aze"
 END LC_ADDRESS
 
@@ -285,6 +287,5 @@ name_ms "<U062E><U0627><U0646><U06CC><U0645>"
 name_mrs "<U062E><U0627><U0646><U06CC><U0645>"
 % Agha
 name_mr "<U0622><U063A><U0627>"
-name_fmt "<U0025><U0064><U0025><U0074><U0025><U0073><U0025><U0074>/
-<U0025><U0067><U0025><U0074><U0025><U006D><U0025><U0074><U0025><U0066>"
+name_fmt "%d%t%s%t%g%t%m%t%f"
 END LC_NAME
-- 
2.43.5