diff options
-rw-r--r-- | src/core/basetypes/MCData.cpp | 5 | ||||
-rw-r--r-- | unittest/data/summary/input/989-encoding-6.eml | 28 | ||||
-rw-r--r-- | unittest/data/summary/input/989-encoding-7.eml (renamed from unittest/data/summary/input/encoding-windows-1251.eml) | 0 | ||||
-rw-r--r-- | unittest/data/summary/input/989-encoding-8.eml (renamed from unittest/data/summary/input/message-win1251.eml) | 0 | ||||
-rw-r--r-- | unittest/data/summary/output/989-encoding-6.txt | 19 | ||||
-rw-r--r-- | unittest/data/summary/output/989-encoding-7.txt (renamed from unittest/data/summary/output/encoding-windows-1251.txt) | 0 | ||||
-rw-r--r-- | unittest/data/summary/output/989-encoding-8.txt (renamed from unittest/data/summary/output/message-win1251.txt) | 0 |
7 files changed, 52 insertions, 0 deletions
diff --git a/src/core/basetypes/MCData.cpp b/src/core/basetypes/MCData.cpp index 008cb7f0..1fbca6b4 100644 --- a/src/core/basetypes/MCData.cpp +++ b/src/core/basetypes/MCData.cpp @@ -474,6 +474,11 @@ String * Data::charsetWithFilteredHTML(bool filterHTML, String * hintCharset) result = hintCharset; } + if (result->lowercaseString()->isEqual(MCSTR("x-mac-cyrillic")) && + hintCharset->lowercaseString()->isEqual(MCSTR("windows-1251"))) { + result = MCSTR("windows-1251"); + } + return result; #endif } diff --git a/unittest/data/summary/input/989-encoding-6.eml b/unittest/data/summary/input/989-encoding-6.eml new file mode 100644 index 00000000..1234332f --- /dev/null +++ b/unittest/data/summary/input/989-encoding-6.eml @@ -0,0 +1,28 @@ +From 0@xxx 2014-12-12 22:59:42 +0000
+From: "Test test" <test@test.net>
+Content-Type: text/plain;
+ charset=windows-1251
+Content-Transfer-Encoding: quoted-printable
+Mime-Version: 1.0 (1.0)
+Subject: Re: Test test
+To: "Test test" <test@test.net>
+Message-Id: <E5D5C2EB-305B-4577-8D3F-F61D1167D52E@test.net>
+Date: Fri, 01 Dec 2014 23:59:42 +0100
+
+=C7=E4=F0=E0=E2=F1=F2=E2=F3=E9=F2=E5, =C0=EB=E5=EA=F1. =CA=E0=E6=E5=F2=F1=FF=
+, =E2=FB =F1=E4=E5=EB=E0=EB=E8 =EE=F7=E5=ED=FC =F5=EE=F0=EE=F8=F3=FE =E2=E5=F9=
+=FC, =F1=EF=E0=F1=E8=E1=EE.
+
+Test
+
+> 10.12.2014, =E2 23:12, Test <test@test.net> =ED=E0=EF=E8=F1=E0=
+=EB(=E0):
+>=20
+> Hi,
+>=20
+> ...
+>=20
+> To do this just open the app on your iPad now, tap =93Activate=94, =93=
+Login=94 or =93Signup=94 button, then follow the instructions on screen.
+>=20
+
diff --git a/unittest/data/summary/input/encoding-windows-1251.eml b/unittest/data/summary/input/989-encoding-7.eml index 84a1dc20..84a1dc20 100644 --- a/unittest/data/summary/input/encoding-windows-1251.eml +++ b/unittest/data/summary/input/989-encoding-7.eml diff --git a/unittest/data/summary/input/message-win1251.eml b/unittest/data/summary/input/989-encoding-8.eml index 8af55102..8af55102 100644 --- a/unittest/data/summary/input/message-win1251.eml +++ b/unittest/data/summary/input/989-encoding-8.eml diff --git a/unittest/data/summary/output/989-encoding-6.txt b/unittest/data/summary/output/989-encoding-6.txt new file mode 100644 index 00000000..2cca70c3 --- /dev/null +++ b/unittest/data/summary/output/989-encoding-6.txt @@ -0,0 +1,19 @@ +From:Test test<test@test.net> +To:Test test<test@test.net> +Subject:Test test +Date:December 1, 2014 at 2:59:42 PM PST + + +Здравствуйте, Алекс. Кажется, вы сделали очень хорошую вещь, спасибо. + +Test + +> 10.12.2014, в 23:12, Test<test@test.net>написал(а): +> +> Hi, +> +> ... +> +> To do this just open the app on your iPad now, tap “Activate”, “Login” or “Signup” button, then follow the instructions on screen. +> + diff --git a/unittest/data/summary/output/encoding-windows-1251.txt b/unittest/data/summary/output/989-encoding-7.txt index 886d16fc..886d16fc 100644 --- a/unittest/data/summary/output/encoding-windows-1251.txt +++ b/unittest/data/summary/output/989-encoding-7.txt diff --git a/unittest/data/summary/output/message-win1251.txt b/unittest/data/summary/output/989-encoding-8.txt index ab8d78f3..ab8d78f3 100644 --- a/unittest/data/summary/output/message-win1251.txt +++ b/unittest/data/summary/output/989-encoding-8.txt |