about summary refs log tree commit diff
diff options
context:
space:
mode:
authorAkhilesh Kumar <akhilesh.k@samsung.com>2017-07-19 11:47:01 +0530
committerMike FABIAN <mfabian@redhat.com>2017-07-19 17:44:09 +0200
commit43cd85db51857afc7254c9926ea7b41506494202 (patch)
tree2b0ca2775582d39ec86e5ee6a28623e69c142598
parent47f27396591fdc4875ecc1663f6d4315edacb5a1 (diff)
downloadglibc-43cd85db51857afc7254c9926ea7b41506494202.tar.gz
glibc-43cd85db51857afc7254c9926ea7b41506494202.tar.xz
glibc-43cd85db51857afc7254c9926ea7b41506494202.zip
Fix consistency in country_isbn in various locales and add comment to country_num in nr_ZA
	[BZ #21784]
	* locales/bo_CN (LC_ADDRESS): Fix inconsistency in country_isbn.
	* locales/fa_IR (LC_ADDRESS): Fix inconsistency in country_isbn.
	* locales/nan_TW@latin (LC_ADDRESS): Fix inconsistency in country_isbn.
	* locales/nr_ZA (LC_ADDRESS): Add country_num.
	* locales/sr_RS (LC_ADDRESS): Fix inconsistency in country_isbn.
	* locales/sr_RS@latin (LC_ADDRESS): Fix inconsistency in country_isbn.
	* locales/ug_CN (LC_ADDRESS): Fix inconsistency in country_isbn.
	* locales/yue_HK (LC_ADDRESS): Fix inconsistency in country_isbn.
	* locales/zh_CN (LC_ADDRESS): Fix inconsistency in country_isbn.
	* locales/zh_TW (LC_ADDRESS): Fix inconsistency in country_isbn.
-rw-r--r--localedata/ChangeLog14
-rw-r--r--localedata/locales/bo_CN2
-rw-r--r--localedata/locales/fa_IR2
-rw-r--r--localedata/locales/nan_TW@latin2
-rw-r--r--localedata/locales/nr_ZA4
-rw-r--r--localedata/locales/sr_RS2
-rw-r--r--localedata/locales/sr_RS@latin2
-rw-r--r--localedata/locales/ug_CN2
-rw-r--r--localedata/locales/yue_HK2
-rw-r--r--localedata/locales/zh_CN2
-rw-r--r--localedata/locales/zh_TW2
11 files changed, 25 insertions, 11 deletions
diff --git a/localedata/ChangeLog b/localedata/ChangeLog
index 65b47cc1ed..e6cc98dc20 100644
--- a/localedata/ChangeLog
+++ b/localedata/ChangeLog
@@ -1,5 +1,19 @@
 2017-07-19  Akhilesh Kumar <akhilesh.k@samsung.com>
 
+	[BZ #21784]
+	* locales/bo_CN (LC_ADDRESS): Fix inconsistency in country_isbn.
+	* locales/fa_IR (LC_ADDRESS): Fix inconsistency in country_isbn.
+	* locales/nan_TW@latin (LC_ADDRESS): Fix inconsistency in country_isbn.
+	* locales/nr_ZA (LC_ADDRESS): Add country_num.
+	* locales/sr_RS (LC_ADDRESS): Fix inconsistency in country_isbn.
+	* locales/sr_RS@latin (LC_ADDRESS): Fix inconsistency in country_isbn.
+	* locales/ug_CN (LC_ADDRESS): Fix inconsistency in country_isbn.
+	* locales/yue_HK (LC_ADDRESS): Fix inconsistency in country_isbn.
+	* locales/zh_CN (LC_ADDRESS): Fix inconsistency in country_isbn.
+	* locales/zh_TW (LC_ADDRESS): Fix inconsistency in country_isbn.
+
+2017-07-19  Akhilesh Kumar <akhilesh.k@samsung.com>
+
 	[BZ #21783 ]
 	* locales/ar_AE (LC_TELEPHONE): Add int_select.
 	* locales/ar_BH (LC_TELEPHONE): Fix int_select.
diff --git a/localedata/locales/bo_CN b/localedata/locales/bo_CN
index 708ceb3a97..987e301b33 100644
--- a/localedata/locales/bo_CN
+++ b/localedata/locales/bo_CN
@@ -170,7 +170,7 @@ country_ab2	"<U0043><U004E>"
 country_ab3	"<U0043><U0048><U004E>"
 country_num	156
 country_car "<U0043><U0048><U004E>"
-country_isbn	"<U0037>"
+country_isbn	7
 lang_name     "<U0F56><U0F7C><U0F51><U0F0B><U0F66><U0F90><U0F51><U0F0B>"
 % bo
 lang_ab       "<U0062><U006F>"
diff --git a/localedata/locales/fa_IR b/localedata/locales/fa_IR
index c5a22c4b87..1e597036a7 100644
--- a/localedata/locales/fa_IR
+++ b/localedata/locales/fa_IR
@@ -476,7 +476,7 @@ country_ab2    "<U0049><U0052>"
 country_ab3    "<U0049><U0052><U004E>"
 country_num    364
 country_car    "<U0049><U0052>"
-country_isbn   "<U0039><U0036><U0034>"
+country_isbn   964
 lang_name      "<U0641><U0627><U0631><U0633><U06CC>"
 lang_ab        "<U0066><U0061>"
 lang_term      "<U0066><U0061><U0073>"
diff --git a/localedata/locales/nan_TW@latin b/localedata/locales/nan_TW@latin
index 5379b23201..ec1c9e6109 100644
--- a/localedata/locales/nan_TW@latin
+++ b/localedata/locales/nan_TW@latin
@@ -187,7 +187,7 @@ country_ab2	"<U0054><U0057>"
 country_ab3	"<U0054><U0057><U004E>"
 country_num	158
 country_car "<U0052><U0043>"
-country_isbn	"<U0039><U0035><U0037>"
+country_isbn	957
 %lang_name "Bân-lâm-gú, Hō-ló-oē"
 lang_name "<U0042><U00E2><U006E><U002D><U006C><U00E2><U006D><U002D><U0067><U00FA><U002C><U0020><U0048><U014D><U002D><U006C><U00F3><U002D><U006F><U0113>"
 lang_term "<U006E><U0061><U006E>"
diff --git a/localedata/locales/nr_ZA b/localedata/locales/nr_ZA
index cf6a609cd4..5cb4e570fb 100644
--- a/localedata/locales/nr_ZA
+++ b/localedata/locales/nr_ZA
@@ -233,7 +233,8 @@ country_car   "<U005A><U0041>"
 
 % FIXME define the following correctly
 % country_isbn ""
-% country_num
+% https://en.wikipedia.org/wiki/ISO_3166-1_numeric
+country_num 710
 
 % Language name in Southern Ndebele - "IsiNdebele"
 lang_name "<U0049><U0073><U0069><U004E><U0064><U0065><U0062><U0065><U006C><U0065>"
@@ -284,5 +285,4 @@ postal_fmt    "<U0025><U0066><U0025><U004E><U0025><U0061><U0025><U004E>/
 country_ab2   "<U005A><U0041>"
 % ZAF
 country_ab3   "<U005A><U0041><U0046>"
-country_num   710
 END LC_ADDRESS
diff --git a/localedata/locales/sr_RS b/localedata/locales/sr_RS
index cedf0f70f3..6d58f87a5a 100644
--- a/localedata/locales/sr_RS
+++ b/localedata/locales/sr_RS
@@ -341,7 +341,7 @@ country_name  "<U0421><U0440><U0431><U0438><U0458><U0430>"
 country_num   688
 country_car   "<U0053><U0052><U0042>"
 % FIXME: ISBN code is what? "86" that preceedes all the numbers?
-country_isbn  "<U0038><U0036>"
+country_isbn  86
 lang_name     "<U0441><U0440><U043F><U0441><U043A><U0438>"
 % srp
 lang_term     "<U0073><U0072><U0070>"
diff --git a/localedata/locales/sr_RS@latin b/localedata/locales/sr_RS@latin
index 856ccff72b..6ecfb40a34 100644
--- a/localedata/locales/sr_RS@latin
+++ b/localedata/locales/sr_RS@latin
@@ -159,7 +159,7 @@ country_post  "<U0053><U0052><U0042>"
 country_name "<U0053><U0072><U0062><U0069><U006A><U0061>"
 country_num   688
 country_car   "<U0053><U0052><U0042>"
-country_isbn  "<U0038><U0036>"
+country_isbn  86
 lang_name     "<U0073><U0072><U0070><U0073><U006B><U0069>"
 % srp
 lang_term     "<U0073><U0072><U0070>"
diff --git a/localedata/locales/ug_CN b/localedata/locales/ug_CN
index 3773176290..f9883d6eac 100644
--- a/localedata/locales/ug_CN
+++ b/localedata/locales/ug_CN
@@ -325,7 +325,7 @@ country_ab2	"<U0043><U004E>"
 country_ab3	"<U0043><U0048><U004E>"
 country_num	156
 country_car "<U0043><U0048><U004E>"
-country_isbn	"<U0037>"
+country_isbn	7
 % ug
 lang_ab      "<U0075><U0067>"
 % uig
diff --git a/localedata/locales/yue_HK b/localedata/locales/yue_HK
index 67151f9444..08ab0a1b4d 100644
--- a/localedata/locales/yue_HK
+++ b/localedata/locales/yue_HK
@@ -158,7 +158,7 @@ country_ab2 "<U0048><U004B>"
 country_ab3 "<U0048><U004B><U0047>"
 country_num 344
 country_car "<U0048><U004B>"
-country_isbn "<U0039><U0036><U0032>"
+country_isbn 962
 lang_name "<U7CB5><U8A9E>"
 % yue
 lang_term    "<U0079><U0075><U0065>"
diff --git a/localedata/locales/zh_CN b/localedata/locales/zh_CN
index a1bec7c359..683aa71dfc 100644
--- a/localedata/locales/zh_CN
+++ b/localedata/locales/zh_CN
@@ -184,7 +184,7 @@ country_ab2	"<U0043><U004E>"
 country_ab3	"<U0043><U0048><U004E>"
 country_num	156
 country_car "<U0043><U0048><U004E>"
-country_isbn	"<U0037>"
+country_isbn	7
 lang_name	"<U4E2D><U6587>"
 lang_ab		"<U007A><U0068>"
 lang_term	"<U007A><U0068><U006F>"
diff --git a/localedata/locales/zh_TW b/localedata/locales/zh_TW
index 08ebd9c4fa..913c5947b5 100644
--- a/localedata/locales/zh_TW
+++ b/localedata/locales/zh_TW
@@ -189,7 +189,7 @@ country_ab2	"<U0054><U0057>"
 country_ab3	"<U0054><U0057><U004E>"
 country_num	158
 country_car "<U0052><U0043>"
-country_isbn	"<U0039><U0035><U0037>"
+country_isbn	957
 
 % Reference:	http://lcweb.loc.gov/standards/iso639-2/langhome.html
 % lang_ab:	zh