Skip to content

C
cpython
Commit 715233c3 authored by Serhiy Storchaka's avatar Serhiy Storchaka
Browse files
Options

Issue #20034: Updated alias mapping to most recent locale.alias file 

from X.org distribution using makelocalealias.py.
parent bea3534e
Show whitespace changes
Inline Side-by-side
Showing with 46 additions and 11 deletions
Lib/locale.py
View file @ 715233c3
...@@ -775,11 +775,30 @@ locale_encoding_alias = { ...@@ -775,11 +775,30 @@ locale_encoding_alias = {
# updated 'sr_yu.utf8@cyrillic' -> 'sr_CS.UTF-8' to 'sr_RS.UTF-8' # updated 'sr_yu.utf8@cyrillic' -> 'sr_CS.UTF-8' to 'sr_RS.UTF-8'
# updated 'sr_yu@cyrillic' -> 'sr_CS.ISO8859-5' to 'sr_RS.UTF-8' # updated 'sr_yu@cyrillic' -> 'sr_CS.ISO8859-5' to 'sr_RS.UTF-8'
# #
# SS 2013-12-20:
# Updated alias mapping to most recent locale.alias file
# from X.org distribution using makelocalealias.py.
#
# These are the differences compared to the old mapping (Python 3.3.3
# and older):
#
# updated 'a3' -> 'a3_AZ.KOI8-C' to 'az_AZ.KOI8-C'
# updated 'a3_az' -> 'a3_AZ.KOI8-C' to 'az_AZ.KOI8-C'
# updated 'a3_az.koi8c' -> 'a3_AZ.KOI8-C' to 'az_AZ.KOI8-C'
# updated 'cs_cs.iso88592' -> 'cs_CS.ISO8859-2' to 'cs_CZ.ISO8859-2'
# updated 'hebrew' -> 'iw_IL.ISO8859-8' to 'he_IL.ISO8859-8'
# updated 'hebrew.iso88598' -> 'iw_IL.ISO8859-8' to 'he_IL.ISO8859-8'
# updated 'sd' -> 'sd_IN@devanagari.UTF-8' to 'sd_IN.UTF-8'
# updated 'sr@latn' -> 'sr_RS.UTF-8@latin' to 'sr_CS.UTF-8@latin'
# updated 'sr_cs' -> 'sr_RS.UTF-8' to 'sr_CS.UTF-8'
# updated 'sr_cs.utf8@latn' -> 'sr_RS.UTF-8@latin' to 'sr_CS.UTF-8@latin'
# updated 'sr_cs@latn' -> 'sr_RS.UTF-8@latin' to 'sr_CS.UTF-8@latin'
locale_alias = { locale_alias = {
'a3': 'a3_AZ.KOI8-C', 'a3': 'az_AZ.KOI8-C',
'a3_az': 'a3_AZ.KOI8-C', 'a3_az': 'az_AZ.KOI8-C',
'a3_az.koi8c': 'a3_AZ.KOI8-C', 'a3_az.koi8c': 'az_AZ.KOI8-C',
'a3_az.koic': 'az_AZ.KOI8-C',
'af': 'af_ZA.ISO8859-1', 'af': 'af_ZA.ISO8859-1',
'af_za': 'af_ZA.ISO8859-1', 'af_za': 'af_ZA.ISO8859-1',
'af_za.iso88591': 'af_ZA.ISO8859-1', 'af_za.iso88591': 'af_ZA.ISO8859-1',
...@@ -798,6 +817,7 @@ locale_alias = { ...@@ -798,6 +817,7 @@ locale_alias = {
'ar_dz.iso88596': 'ar_DZ.ISO8859-6', 'ar_dz.iso88596': 'ar_DZ.ISO8859-6',
'ar_eg': 'ar_EG.ISO8859-6', 'ar_eg': 'ar_EG.ISO8859-6',
'ar_eg.iso88596': 'ar_EG.ISO8859-6', 'ar_eg.iso88596': 'ar_EG.ISO8859-6',
'ar_in': 'ar_IN.UTF-8',
'ar_iq': 'ar_IQ.ISO8859-6', 'ar_iq': 'ar_IQ.ISO8859-6',
'ar_iq.iso88596': 'ar_IQ.ISO8859-6', 'ar_iq.iso88596': 'ar_IQ.ISO8859-6',
'ar_jo': 'ar_JO.ISO8859-6', 'ar_jo': 'ar_JO.ISO8859-6',
...@@ -827,6 +847,7 @@ locale_alias = { ...@@ -827,6 +847,7 @@ locale_alias = {
'arabic': 'ar_AA.ISO8859-6', 'arabic': 'ar_AA.ISO8859-6',
'arabic.iso88596': 'ar_AA.ISO8859-6', 'arabic.iso88596': 'ar_AA.ISO8859-6',
'as': 'as_IN.UTF-8', 'as': 'as_IN.UTF-8',
'as_in': 'as_IN.UTF-8',
'az': 'az_AZ.ISO8859-9E', 'az': 'az_AZ.ISO8859-9E',
'az_az': 'az_AZ.ISO8859-9E', 'az_az': 'az_AZ.ISO8859-9E',
'az_az.iso88599e': 'az_AZ.ISO8859-9E', 'az_az.iso88599e': 'az_AZ.ISO8859-9E',
...@@ -844,6 +865,7 @@ locale_alias = { ...@@ -844,6 +865,7 @@ locale_alias = {
'bg_bg.koi8r': 'bg_BG.KOI8-R', 'bg_bg.koi8r': 'bg_BG.KOI8-R',
'bg_bg.microsoftcp1251': 'bg_BG.CP1251', 'bg_bg.microsoftcp1251': 'bg_BG.CP1251',
'bn_in': 'bn_IN.UTF-8', 'bn_in': 'bn_IN.UTF-8',
'bo_in': 'bo_IN.UTF-8',
'bokmal': 'nb_NO.ISO8859-1', 'bokmal': 'nb_NO.ISO8859-1',
'bokm\xe5l': 'nb_NO.ISO8859-1', 'bokm\xe5l': 'nb_NO.ISO8859-1',
'br': 'br_FR.ISO8859-1', 'br': 'br_FR.ISO8859-1',
...@@ -861,6 +883,7 @@ locale_alias = { ...@@ -861,6 +883,7 @@ locale_alias = {
'c': 'C', 'c': 'C',
'c-french': 'fr_CA.ISO8859-1', 'c-french': 'fr_CA.ISO8859-1',
'c-french.iso88591': 'fr_CA.ISO8859-1', 'c-french.iso88591': 'fr_CA.ISO8859-1',
'c.ascii': 'C',
'c.en': 'C', 'c.en': 'C',
'c.iso88591': 'en_US.ISO8859-1', 'c.iso88591': 'en_US.ISO8859-1',
'c_c': 'C', 'c_c': 'C',
...@@ -898,7 +921,7 @@ locale_alias = { ...@@ -898,7 +921,7 @@ locale_alias = {
'croatian': 'hr_HR.ISO8859-2', 'croatian': 'hr_HR.ISO8859-2',
'cs': 'cs_CZ.ISO8859-2', 'cs': 'cs_CZ.ISO8859-2',
'cs_cs': 'cs_CZ.ISO8859-2', 'cs_cs': 'cs_CZ.ISO8859-2',
'cs_cs.iso88592': 'cs_CS.ISO8859-2', 'cs_cs.iso88592': 'cs_CZ.ISO8859-2',
'cs_cz': 'cs_CZ.ISO8859-2', 'cs_cz': 'cs_CZ.ISO8859-2',
'cs_cz.iso88592': 'cs_CZ.ISO8859-2', 'cs_cz.iso88592': 'cs_CZ.ISO8859-2',
'cy': 'cy_GB.ISO8859-1', 'cy': 'cy_GB.ISO8859-1',
...@@ -1202,12 +1225,13 @@ locale_alias = { ...@@ -1202,12 +1225,13 @@ locale_alias = {
'he_il.cp1255': 'he_IL.CP1255', 'he_il.cp1255': 'he_IL.CP1255',
'he_il.iso88598': 'he_IL.ISO8859-8', 'he_il.iso88598': 'he_IL.ISO8859-8',
'he_il.microsoftcp1255': 'he_IL.CP1255', 'he_il.microsoftcp1255': 'he_IL.CP1255',
'hebrew': 'iw_IL.ISO8859-8', 'hebrew': 'he_IL.ISO8859-8',
'hebrew.iso88598': 'iw_IL.ISO8859-8', 'hebrew.iso88598': 'he_IL.ISO8859-8',
'hi': 'hi_IN.ISCII-DEV', 'hi': 'hi_IN.ISCII-DEV',
'hi_in': 'hi_IN.ISCII-DEV', 'hi_in': 'hi_IN.ISCII-DEV',
'hi_in.isciidev': 'hi_IN.ISCII-DEV', 'hi_in.isciidev': 'hi_IN.ISCII-DEV',
'hne': 'hne_IN.UTF-8', 'hne': 'hne_IN.UTF-8',
'hne_in': 'hne_IN.UTF-8',
'hr': 'hr_HR.ISO8859-2', 'hr': 'hr_HR.ISO8859-2',
'hr_hr': 'hr_HR.ISO8859-2', 'hr_hr': 'hr_HR.ISO8859-2',
'hr_hr.iso88592': 'hr_HR.ISO8859-2', 'hr_hr.iso88592': 'hr_HR.ISO8859-2',
...@@ -1295,6 +1319,7 @@ locale_alias = { ...@@ -1295,6 +1319,7 @@ locale_alias = {
'korean': 'ko_KR.eucKR', 'korean': 'ko_KR.eucKR',
'korean.euc': 'ko_KR.eucKR', 'korean.euc': 'ko_KR.eucKR',
'ks': 'ks_IN.UTF-8', 'ks': 'ks_IN.UTF-8',
'ks_in': 'ks_IN.UTF-8',
'ks_in@devanagari': 'ks_IN@devanagari.UTF-8', 'ks_in@devanagari': 'ks_IN@devanagari.UTF-8',
'kw': 'kw_GB.ISO8859-1', 'kw': 'kw_GB.ISO8859-1',
'kw_gb': 'kw_GB.ISO8859-1', 'kw_gb': 'kw_GB.ISO8859-1',
...@@ -1319,6 +1344,7 @@ locale_alias = { ...@@ -1319,6 +1344,7 @@ locale_alias = {
'lv_lv.iso885913': 'lv_LV.ISO8859-13', 'lv_lv.iso885913': 'lv_LV.ISO8859-13',
'lv_lv.iso88594': 'lv_LV.ISO8859-4', 'lv_lv.iso88594': 'lv_LV.ISO8859-4',
'mai': 'mai_IN.UTF-8', 'mai': 'mai_IN.UTF-8',
'mai_in': 'mai_IN.UTF-8',
'mi': 'mi_NZ.ISO8859-1', 'mi': 'mi_NZ.ISO8859-1',
'mi_nz': 'mi_NZ.ISO8859-1', 'mi_nz': 'mi_NZ.ISO8859-1',
'mi_nz.iso88591': 'mi_NZ.ISO8859-1', 'mi_nz.iso88591': 'mi_NZ.ISO8859-1',
...@@ -1328,6 +1354,7 @@ locale_alias = { ...@@ -1328,6 +1354,7 @@ locale_alias = {
'mk_mk.iso88595': 'mk_MK.ISO8859-5', 'mk_mk.iso88595': 'mk_MK.ISO8859-5',
'mk_mk.microsoftcp1251': 'mk_MK.CP1251', 'mk_mk.microsoftcp1251': 'mk_MK.CP1251',
'ml': 'ml_IN.UTF-8', 'ml': 'ml_IN.UTF-8',
'ml_in': 'ml_IN.UTF-8',
'mr': 'mr_IN.UTF-8', 'mr': 'mr_IN.UTF-8',
'mr_in': 'mr_IN.UTF-8', 'mr_in': 'mr_IN.UTF-8',
'ms': 'ms_MY.ISO8859-1', 'ms': 'ms_MY.ISO8859-1',
...@@ -1342,6 +1369,7 @@ locale_alias = { ...@@ -1342,6 +1369,7 @@ locale_alias = {
'nb_no.iso88591': 'nb_NO.ISO8859-1', 'nb_no.iso88591': 'nb_NO.ISO8859-1',
'nb_no.iso885915': 'nb_NO.ISO8859-15', 'nb_no.iso885915': 'nb_NO.ISO8859-15',
'nb_no@euro': 'nb_NO.ISO8859-15', 'nb_no@euro': 'nb_NO.ISO8859-15',
'ne_np': 'ne_NP.UTF-8',
'nl': 'nl_NL.ISO8859-1', 'nl': 'nl_NL.ISO8859-1',
'nl.iso885915': 'nl_NL.ISO8859-15', 'nl.iso885915': 'nl_NL.ISO8859-15',
'nl_be': 'nl_BE.ISO8859-1', 'nl_be': 'nl_BE.ISO8859-1',
...@@ -1394,6 +1422,7 @@ locale_alias = { ...@@ -1394,6 +1422,7 @@ locale_alias = {
'oc_fr.iso885915': 'oc_FR.ISO8859-15', 'oc_fr.iso885915': 'oc_FR.ISO8859-15',
'oc_fr@euro': 'oc_FR.ISO8859-15', 'oc_fr@euro': 'oc_FR.ISO8859-15',
'or': 'or_IN.UTF-8', 'or': 'or_IN.UTF-8',
'or_in': 'or_IN.UTF-8',
'pa': 'pa_IN.UTF-8', 'pa': 'pa_IN.UTF-8',
'pa_in': 'pa_IN.UTF-8', 'pa_in': 'pa_IN.UTF-8',
'pd': 'pd_US.ISO8859-1', 'pd': 'pd_US.ISO8859-1',
...@@ -1455,7 +1484,9 @@ locale_alias = { ...@@ -1455,7 +1484,9 @@ locale_alias = {
'rw': 'rw_RW.ISO8859-1', 'rw': 'rw_RW.ISO8859-1',
'rw_rw': 'rw_RW.ISO8859-1', 'rw_rw': 'rw_RW.ISO8859-1',
'rw_rw.iso88591': 'rw_RW.ISO8859-1', 'rw_rw.iso88591': 'rw_RW.ISO8859-1',
'sd': 'sd_IN@devanagari.UTF-8', 'sd': 'sd_IN.UTF-8',
'sd@devanagari': 'sd_IN@devanagari.UTF-8',
'sd_in@devanagari': 'sd_IN@devanagari.UTF-8',
'se_no': 'se_NO.UTF-8', 'se_no': 'se_NO.UTF-8',
'serbocroatian': 'sr_RS.UTF-8@latin', 'serbocroatian': 'sr_RS.UTF-8@latin',
'sh': 'sr_RS.UTF-8@latin', 'sh': 'sr_RS.UTF-8@latin',
...@@ -1489,13 +1520,13 @@ locale_alias = { ...@@ -1489,13 +1520,13 @@ locale_alias = {
'sr': 'sr_RS.UTF-8', 'sr': 'sr_RS.UTF-8',
'sr@cyrillic': 'sr_RS.UTF-8', 'sr@cyrillic': 'sr_RS.UTF-8',
'sr@latin': 'sr_RS.UTF-8@latin', 'sr@latin': 'sr_RS.UTF-8@latin',
'sr@latn': 'sr_RS.UTF-8@latin', 'sr@latn': 'sr_CS.UTF-8@latin',
'sr_cs': 'sr_RS.UTF-8', 'sr_cs': 'sr_CS.UTF-8',
'sr_cs.iso88592': 'sr_CS.ISO8859-2', 'sr_cs.iso88592': 'sr_CS.ISO8859-2',
'sr_cs.iso88592@latn': 'sr_CS.ISO8859-2', 'sr_cs.iso88592@latn': 'sr_CS.ISO8859-2',
'sr_cs.iso88595': 'sr_CS.ISO8859-5', 'sr_cs.iso88595': 'sr_CS.ISO8859-5',
'sr_cs.utf8@latn': 'sr_RS.UTF-8@latin', 'sr_cs.utf8@latn': 'sr_CS.UTF-8@latin',
'sr_cs@latn': 'sr_RS.UTF-8@latin', 'sr_cs@latn': 'sr_CS.UTF-8@latin',
'sr_me': 'sr_ME.UTF-8', 'sr_me': 'sr_ME.UTF-8',
'sr_rs': 'sr_RS.UTF-8', 'sr_rs': 'sr_RS.UTF-8',
'sr_rs.utf8@latn': 'sr_RS.UTF-8@latin', 'sr_rs.utf8@latn': 'sr_RS.UTF-8@latin',
...@@ -1573,6 +1604,7 @@ locale_alias = { ...@@ -1573,6 +1604,7 @@ locale_alias = {
'universal': 'en_US.utf', 'universal': 'en_US.utf',
'universal.utf8@ucs4': 'en_US.UTF-8', 'universal.utf8@ucs4': 'en_US.UTF-8',
'ur': 'ur_PK.CP1256', 'ur': 'ur_PK.CP1256',
'ur_in': 'ur_IN.UTF-8',
'ur_pk': 'ur_PK.CP1256', 'ur_pk': 'ur_PK.CP1256',
'ur_pk.cp1256': 'ur_PK.CP1256', 'ur_pk.cp1256': 'ur_PK.CP1256',
'ur_pk.microsoftcp1256': 'ur_PK.CP1256', 'ur_pk.microsoftcp1256': 'ur_PK.CP1256',
......
Misc/NEWS
View file @ 715233c3
...@@ -29,6 +29,9 @@ Core and Builtins ...@@ -29,6 +29,9 @@ Core and Builtins
Library Library
------- -------
- Issue #20034: Updated alias mapping to most recent locale.alias file
from X.org distribution using makelocalealias.py.
- Issue #5815: Fixed support for locales with modifiers. Fixed support for - Issue #5815: Fixed support for locales with modifiers. Fixed support for
locale encodings with hyphens. locale encodings with hyphens.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7