Browse Source
Remove mojibake in the locale aliases mapping. (GH-6716)
pull/1937/merge
Serhiy Storchaka
8 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with
3 additions and
2 deletions
-
Lib/locale.py
-
Tools/i18n/makelocalealias.py
|
|
|
@ -923,7 +923,6 @@ locale_alias = { |
|
|
|
'bo_in': 'bo_IN.UTF-8', |
|
|
|
'bokmal': 'nb_NO.ISO8859-1', |
|
|
|
'bokm\xe5l': 'nb_NO.ISO8859-1', |
|
|
|
'bokm\xef\xbf\xbd': 'nb_NO.ISO8859-1', |
|
|
|
'br': 'br_FR.ISO8859-1', |
|
|
|
'br_fr': 'br_FR.ISO8859-1', |
|
|
|
'brx_in': 'brx_IN.UTF-8', |
|
|
|
@ -1072,7 +1071,6 @@ locale_alias = { |
|
|
|
'fr_fr': 'fr_FR.ISO8859-1', |
|
|
|
'fr_lu': 'fr_LU.ISO8859-1', |
|
|
|
'fran\xe7ais': 'fr_FR.ISO8859-1', |
|
|
|
'fran\xef\xbf\xbdis': 'fr_FR.ISO8859-1', |
|
|
|
'fre_fr': 'fr_FR.ISO8859-1', |
|
|
|
'french': 'fr_FR.ISO8859-1', |
|
|
|
'french.iso88591': 'fr_CH.ISO8859-1', |
|
|
|
|
|
|
|
@ -19,6 +19,9 @@ def parse(filename): |
|
|
|
|
|
|
|
with open(filename, encoding='latin1') as f: |
|
|
|
lines = list(f) |
|
|
|
# Remove mojibake in /usr/share/X11/locale/locale.alias. |
|
|
|
# b'\xef\xbf\xbd' == '\ufffd'.encode('utf-8') |
|
|
|
lines = [line for line in lines if '\xef\xbf\xbd' not in line] |
|
|
|
data = {} |
|
|
|
for line in lines: |
|
|
|
line = line.strip() |
|
|
|
|
