summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSerhiy Storchaka <storchaka@gmail.com>2014-10-01 21:09:37 (GMT)
committerSerhiy Storchaka <storchaka@gmail.com>2014-10-01 21:09:37 (GMT)
commit1de0ba2cf57a2c0f18a1ef4da0641bf9b073ba1e (patch)
treeb3c0295a92eeccdedd2bccaacb0031e56acb0dc0
parent99cb41d423c3794db989031c3938fa60c9792ecc (diff)
downloadcpython-1de0ba2cf57a2c0f18a1ef4da0641bf9b073ba1e.zip
cpython-1de0ba2cf57a2c0f18a1ef4da0641bf9b073ba1e.tar.gz
cpython-1de0ba2cf57a2c0f18a1ef4da0641bf9b073ba1e.tar.bz2
Issue #20076: Added non derived UTF-8 aliases to locale aliases table.
-rw-r--r--Lib/locale.py9
-rw-r--r--Misc/NEWS2
2 files changed, 11 insertions, 0 deletions
diff --git a/Lib/locale.py b/Lib/locale.py
index f7d4d7b..2a39306 100644
--- a/Lib/locale.py
+++ b/Lib/locale.py
@@ -861,6 +861,7 @@ locale_alias = {
'az_az.iso88599e': 'az_AZ.ISO8859-9E',
'be': 'be_BY.CP1251',
'be@latin': 'be_BY.UTF-8@latin',
+ 'be_bg.utf8': 'bg_BG.UTF-8',
'be_by': 'be_BY.CP1251',
'be_by@latin': 'be_BY.UTF-8@latin',
'bem_zm': 'bem_ZM.UTF-8',
@@ -887,6 +888,7 @@ locale_alias = {
'c.ascii': 'C',
'c.en': 'C',
'c.iso88591': 'en_US.ISO8859-1',
+ 'c.utf8': 'en_US.UTF-8',
'c_c': 'C',
'c_c.c': 'C',
'ca': 'ca_ES.ISO8859-1',
@@ -940,6 +942,7 @@ locale_alias = {
'en_bw': 'en_BW.ISO8859-1',
'en_ca': 'en_CA.ISO8859-1',
'en_dk': 'en_DK.ISO8859-1',
+ 'en_dl.utf8': 'en_DL.UTF-8',
'en_gb': 'en_GB.ISO8859-1',
'en_hk': 'en_HK.ISO8859-1',
'en_ie': 'en_IE.ISO8859-1',
@@ -954,6 +957,7 @@ locale_alias = {
'en_za': 'en_ZA.ISO8859-1',
'en_zm': 'en_ZM.UTF-8',
'en_zw': 'en_ZW.ISO8859-1',
+ 'en_zw.utf8': 'en_ZS.UTF-8',
'eng_gb': 'en_GB.ISO8859-1',
'english': 'en_EN.ISO8859-1',
'english_uk': 'en_GB.ISO8859-1',
@@ -1106,6 +1110,7 @@ locale_alias = {
'korean.euc': 'ko_KR.eucKR',
'ks': 'ks_IN.UTF-8',
'ks_in': 'ks_IN.UTF-8',
+ 'ks_in@devanagari.utf8': 'ks_IN.UTF-8@devanagari',
'ku_tr': 'ku_TR.ISO8859-9',
'kw': 'kw_GB.ISO8859-1',
'kw_gb': 'kw_GB.ISO8859-1',
@@ -1218,6 +1223,7 @@ locale_alias = {
'sc_it': 'sc_IT.UTF-8',
'sd': 'sd_IN.UTF-8',
'sd_in': 'sd_IN.UTF-8',
+ 'sd_in@devanagari.utf8': 'sd_IN.UTF-8@devanagari',
'se_no': 'se_NO.UTF-8',
'serbocroatian': 'sr_RS.UTF-8@latin',
'sh': 'sr_RS.UTF-8@latin',
@@ -1258,6 +1264,7 @@ locale_alias = {
'sr_cs@latn': 'sr_CS.UTF-8@latin',
'sr_me': 'sr_ME.UTF-8',
'sr_rs': 'sr_RS.UTF-8',
+ 'sr_rs.utf8@latn': 'sr_RS.UTF-8@latin',
'sr_rs@latn': 'sr_RS.UTF-8@latin',
'sr_sp': 'sr_CS.ISO8859-2',
'sr_yu': 'sr_RS.UTF-8@latin',
@@ -1266,6 +1273,8 @@ locale_alias = {
'sr_yu.iso88595': 'sr_CS.ISO8859-5',
'sr_yu.iso88595@cyrillic': 'sr_CS.ISO8859-5',
'sr_yu.microsoftcp1251@cyrillic': 'sr_CS.CP1251',
+ 'sr_yu.utf8': 'sr_RS.UTF-8',
+ 'sr_yu.utf8@cyrillic': 'sr_RS.UTF-8',
'sr_yu@cyrillic': 'sr_RS.UTF-8',
'ss': 'ss_ZA.ISO8859-1',
'ss_za': 'ss_ZA.ISO8859-1',
diff --git a/Misc/NEWS b/Misc/NEWS
index 3cb7716..182032a 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -19,6 +19,8 @@ Core and Builtins
Library
-------
+- Issue #20076: Added non derived UTF-8 aliases to locale aliases table.
+
- Issue #20079: Added locales supported in glibc 2.18 to locale alias table.
- Issue #22396: On 32-bit AIX platform, don't expose os.posix_fadvise() nor