# HG changeset patch # User Thierry Florac # Date 1425337111 -3600 # Node ID ad40fd66816426bcddb3be125b69b722fe36d613 # Parent 09a8799da676813b3eede580c2ddae979419fa9c Changed encodings codes diff -r 09a8799da676 -r ad40fd668164 src/pyams_utils/encoding.py --- a/src/pyams_utils/encoding.py Mon Mar 02 10:53:34 2015 +0100 +++ b/src/pyams_utils/encoding.py Mon Mar 02 23:58:31 2015 +0100 @@ -69,57 +69,57 @@ 'cp1256': _('Arabic (cp1256)'), 'cp1257': _('Baltic languages (cp1257)'), 'cp1258': _('Vietnamese (cp1258)'), - 'euc_jp': _('Japanese (euc_jp)'), - 'euc_jis_2004': _('Japanese (euc_jis_2004)'), - 'euc_jisx0213': _('Japanese (euc_jisx0213)'), - 'euc_kr': _('Korean (euc_kr)'), + 'euc-jp': _('Japanese (euc_jp)'), + 'euc-jis-2004': _('Japanese (euc_jis_2004)'), + 'euc-jisx0213': _('Japanese (euc_jisx0213)'), + 'euc-kr': _('Korean (euc_kr)'), 'gb2312': _('Simplified Chinese (gb2312)'), 'gbk': _('Unified Chinese (gbk)'), 'gb18030': _('Unified Chinese (gb18030)'), 'hz': _('Simplified Chinese (hz)'), - 'iso2022_jp': _('Japanese (iso2022_jp)'), - 'iso2022_jp_1': _('Japanese (iso2022_jp_1)'), - 'iso2022_jp_2': _('Japanese, Korean, Simplified Chinese, Western Europe, Greek (iso2022_jp_2)'), - 'iso2022_jp_2004': _('Japanese (iso2022_jp_2004)'), - 'iso2022_jp_3': _('Japanese (iso2022_jp_3)'), - 'iso2022_jp_ext': _('Japanese (iso2022_jp_ext)'), - 'iso2022_kr': _('Korean (iso2022_kr)'), - 'latin_1': _('West Europe (latin_1)'), - 'iso8859_2': _('Central and Eastern Europe (iso8859_2)'), - 'iso8859_3': _('Esperanto, Maltese (iso8859_3)'), - 'iso8859_4': _('Baltic languages (iso8859_4)'), - 'iso8859_5': _('Bulgarian, Byelorussian, Macedonian, Russian, Serbian (iso8859_5)'), - 'iso8859_6': _('Arabic (iso8859_6)'), - 'iso8859_7': _('Greek (iso8859_7)'), - 'iso8859_8': _('Hebrew (iso8859_8)'), - 'iso8859_9': _('Turkish (iso8859_9)'), - 'iso8859_10': _('Nordic languages (iso8859_10)'), - 'iso8859_13': _('Baltic languages (iso8859_13)'), - 'iso8859_14': _('Celtic languages (iso8859_14)'), - 'iso8859_15': _('Western Europe (iso8859_15)'), - 'iso8859_16': _('South-Eastern Europe (iso8859_16)'), + 'iso2022-jp': _('Japanese (iso2022_jp)'), + 'iso2022-jp-1': _('Japanese (iso2022_jp_1)'), + 'iso2022-jp-2': _('Japanese, Korean, Simplified Chinese, Western Europe, Greek (iso2022_jp_2)'), + 'iso2022-jp-2004': _('Japanese (iso2022_jp_2004)'), + 'iso2022-jp-3': _('Japanese (iso2022_jp_3)'), + 'iso2022-jp-ext': _('Japanese (iso2022_jp_ext)'), + 'iso2022-kr': _('Korean (iso2022_kr)'), + 'latin-1': _('West Europe (latin_1)'), + 'iso8859-2': _('Central and Eastern Europe (iso8859_2)'), + 'iso8859-3': _('Esperanto, Maltese (iso8859_3)'), + 'iso8859-4': _('Baltic languages (iso8859_4)'), + 'iso8859-5': _('Bulgarian, Byelorussian, Macedonian, Russian, Serbian (iso8859_5)'), + 'iso8859-6': _('Arabic (iso8859_6)'), + 'iso8859-7': _('Greek (iso8859_7)'), + 'iso8859-8': _('Hebrew (iso8859_8)'), + 'iso8859-9': _('Turkish (iso8859_9)'), + 'iso8859-10': _('Nordic languages (iso8859_10)'), + 'iso8859-13': _('Baltic languages (iso8859_13)'), + 'iso8859-14': _('Celtic languages (iso8859_14)'), + 'iso8859-15': _('Western Europe (iso8859_15)'), + 'iso8859-16': _('South-Eastern Europe (iso8859_16)'), 'johab': _('Korean (johab)'), - 'koi8_r': _('Russian (koi8_r)'), - 'koi8_u': _('Ukrainian (koi8_u)'), - 'mac_cyrillic': _('Bulgarian, Byelorussian, Macedonian, Russian, Serbian (mac_cyrillic)'), - 'mac_greek': _('Greek (mac_greek)'), - 'mac_iceland': _('Icelandic (mac_iceland)'), - 'mac_latin2': _('Central and Eastern Europe (mac_latin2)'), - 'mac_roman': _('Western Europe (mac_roman)'), - 'mac_turkish': _('Turkish (mac_turkish)'), + 'koi8-r': _('Russian (koi8_r)'), + 'koi8-u': _('Ukrainian (koi8_u)'), + 'mac-cyrillic': _('Bulgarian, Byelorussian, Macedonian, Russian, Serbian (mac_cyrillic)'), + 'mac-greek': _('Greek (mac_greek)'), + 'mac-iceland': _('Icelandic (mac_iceland)'), + 'mac-latin2': _('Central and Eastern Europe (mac_latin2)'), + 'mac-roman': _('Western Europe (mac_roman)'), + 'mac-turkish': _('Turkish (mac_turkish)'), 'ptcp154': _('Kazakh (ptcp154)'), - 'shift_jis': _('Japanese (shift_jis)'), - 'shift_jis_2004': _('Japanese (shift_jis_2004)'), - 'shift_jisx0213': _('Japanese (shift_jisx0213)'), - 'utf_32': _('all languages (utf_32)'), - 'utf_32_be': _('all languages (utf_32_be)'), - 'utf_32_le': _('all languages (utf_32_le)'), - 'utf_16': _('all languages (utf_16)'), - 'utf_16_be': _('all languages (BMP only - utf_16_be)'), - 'utf_16_le': _('all languages (BMP only - utf_16_le)'), - 'utf_7': _('all languages (utf_7)'), - 'utf_8': _('all languages (utf_8)'), - 'utf_8_sig': _('all languages (utf_8_sig)'), + 'shift-jis': _('Japanese (shift_jis)'), + 'shift-jis-2004': _('Japanese (shift_jis_2004)'), + 'shift-jisx0213': _('Japanese (shift_jisx0213)'), + 'utf-32': _('all languages (utf_32)'), + 'utf-32-be': _('all languages (utf_32_be)'), + 'utf-32-le': _('all languages (utf_32_le)'), + 'utf-16': _('all languages (utf_16)'), + 'utf-16-be': _('all languages (BMP only - utf_16_be)'), + 'utf-16-le': _('all languages (BMP only - utf_16_le)'), + 'utf-7': _('all languages (utf_7)'), + 'utf-8': _('all languages (utf_8)'), + 'utf-8-sig': _('all languages (utf_8_sig)'), }