From 1f8d9272512962516f02f5b13d368f6fda130032 Mon Sep 17 00:00:00 2001 From: Siarzhuk Zharski Date: Sun, 14 Apr 2013 12:34:10 +0200 Subject: [PATCH] Make Windows-1250 encoding consistent with other In sake of consistency with other Windows CP encodings: * print_name is expanded to "Windows Central European (CP 1250)"; * B_MS_WINDOWS_1250_CONVERSION id looks like should be added into UTF8.h; * mime_name set to NULL as other windows codepages have. That prevents at least from duplicating too much 1250's in the Terminal, Mail and StyledEdit encodings menus. --- headers/os/support/UTF8.h | 3 ++- src/kits/textencoding/character_sets.cpp | 11 ++++++----- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/headers/os/support/UTF8.h b/headers/os/support/UTF8.h index c411d2b53b..ab5416a696 100644 --- a/headers/os/support/UTF8.h +++ b/headers/os/support/UTF8.h @@ -39,7 +39,8 @@ enum { B_ISO15_CONVERSION, B_BIG5_CONVERSION, // Chinese Big5 B_GBK_CONVERSION, // Chinese GB18030 - B_UTF16_CONVERSION // Unicode UTF-16 + B_UTF16_CONVERSION, // Unicode UTF-16 + B_MS_WINDOWS_1250_CONVERSION // Windows Central European Codepage }; diff --git a/src/kits/textencoding/character_sets.cpp b/src/kits/textencoding/character_sets.cpp index 1eab4acc2c..ac72fd2bb8 100644 --- a/src/kits/textencoding/character_sets.cpp +++ b/src/kits/textencoding/character_sets.cpp @@ -207,8 +207,8 @@ static const char * windows1251aliases[] = { "cp1251", "cp5347", "ansi-1251", NULL }; -static const BCharacterSet windows1251(18,2251, B_TRANSLATE("Windows Cyrillic (CP 1251)"), - "windows-1251",NULL,windows1251aliases); +static const BCharacterSet windows1251(18,2251, B_TRANSLATE("Windows Cyrillic " + "(CP 1251)"), "windows-1251",NULL,windows1251aliases); static const char * IBM866aliases[] = { // IANA aliases @@ -238,7 +238,8 @@ static const char * eucKRaliases[] = { // IANA aliases "csEUCKR", // java aliases - "ksc5601", "euckr", "ks_c_5601-1987", "ksc5601-1987", "ksc5601_1987", "ksc_5601", "5601", + "ksc5601", "euckr", "ks_c_5601-1987", "ksc5601-1987", + "ksc5601_1987", "ksc_5601", "5601", NULL }; static const BCharacterSet eucKR(21,38, B_TRANSLATE("EUC Korean"), @@ -311,8 +312,8 @@ static const char* kWindows1250Aliases[] = { "ms-ee", NULL }; -static const BCharacterSet kWindows1250(28, 2250, B_TRANSLATE("Windows-1250 " - "(CP-1250)"), "windows-1250", "Windows-1250", kWindows1250Aliases); +static const BCharacterSet kWindows1250(28, 2250, B_TRANSLATE("Windows Central " + "European (CP 1250)"), "windows-1250", NULL, kWindows1250Aliases); /** * The following initializes the global character set array.