From 19a95a1818e34755bffd7c5f9dbd35e214123cac Mon Sep 17 00:00:00 2001 From: Ludovic Marcotte Date: Tue, 10 Jun 2014 08:58:44 -0400 Subject: [PATCH] Applied fix from #2809 --- NEWS | 1 + UI/MailPartViewers/UIxMailPartHTMLViewer.m | 3 +++ 2 files changed, 4 insertions(+) diff --git a/NEWS b/NEWS index a76c2668a..b3350bcc5 100644 --- a/NEWS +++ b/NEWS @@ -7,6 +7,7 @@ Enhancements Bug fixes - better handling of empty "Flag" messages over ActiveSync (#2806) + - fixed Chinese charset handling (#2809) 2.2.5 (2014-06-05) ------------------ diff --git a/UI/MailPartViewers/UIxMailPartHTMLViewer.m b/UI/MailPartViewers/UIxMailPartHTMLViewer.m index df981a470..0b525680b 100644 --- a/UI/MailPartViewers/UIxMailPartHTMLViewer.m +++ b/UI/MailPartViewers/UIxMailPartHTMLViewer.m @@ -86,6 +86,9 @@ _xmlCharsetForCharset (NSString *charset) { @"windows-1251", XML_CHAR_ENCODING_ERROR}, // unsupported, will trigger windows-1251 -> utf8 conversion { @"windows-1257", XML_CHAR_ENCODING_ERROR}, // unsupported, will trigger windows-1257 -> utf8 conversion { @"gb2312", XML_CHAR_ENCODING_ERROR}, // unsupported, will trigger gb2312 -> utf8 conversion + { @"gbk", XML_CHAR_ENCODING_ERROR}, // unsupported, will trigger gb2312 -> utf8 conversion + { @"gb18030", XML_CHAR_ENCODING_ERROR}, // unsupported, will trigger gb2312 -> utf8 conversion + { @"big5", XML_CHAR_ENCODING_ERROR}, // unsupported, will trigger gb2312 -> utf8 conversion { @"euc-jp", XML_CHAR_ENCODING_EUC_JP}}; unsigned count; xmlCharEncoding encoding;