From 1cddfa67f21e876b90078af40f6b1c589315d451 Mon Sep 17 00:00:00 2001 From: Matthew Somerville Date: Tue, 7 Jun 2016 13:16:51 +0100 Subject: Stop using Text::Wrap to wrap email bodies. If we don't do this, the default quoted-printable encoding will make sure the lines are physically wrapped anyway. format=flowed could be an alternative, but I think "=" acting as a quasi-hyphen is somewhat nicer than every line ending with "=20". A better solution could be quoted-printable doing soft wrapping only at word breaks, making each line be readable though end with a " =", but that didn't seem worth the effort involved. --- perllib/FixMyStreet/Email.pm | 8 -------- t/app/helpers/send_email_sample.txt | 14 +++++++------- t/app/helpers/send_email_sample_mime.txt | 14 +++++++------- t/cobrand/zurich_attachments.txt | 2 +- 4 files changed, 15 insertions(+), 23 deletions(-) diff --git a/perllib/FixMyStreet/Email.pm b/perllib/FixMyStreet/Email.pm index d4bfee14e..3d363f80d 100644 --- a/perllib/FixMyStreet/Email.pm +++ b/perllib/FixMyStreet/Email.pm @@ -11,7 +11,6 @@ use Encode; use POSIX qw(); use Template; use Digest::HMAC_SHA1 qw(hmac_sha1_hex); -use Text::Wrap; use mySociety::Locale; use mySociety::Random qw(random_bytes); use Utils::Email; @@ -189,13 +188,6 @@ sub construct_email ($) { # nor followed (?!\n) by a blank line with a single space". $body =~ s#(?{Subject} = $subject if defined($subject); if (!exists($p->{Subject})) { diff --git a/t/app/helpers/send_email_sample.txt b/t/app/helpers/send_email_sample.txt index 87604008c..05303f4b4 100644 --- a/t/app/helpers/send_email_sample.txt +++ b/t/app/helpers/send_email_sample.txt @@ -14,13 +14,13 @@ utf8: =E6=88=91=E4=BB=AC=E5=BA=94=E8=AF=A5=E8=83=BD=E5=A4=9F=E6=97=A0=E7=BC= indented_text -long line: Lorem ipsum dolor sit amet, consectetur adipisicing elit, -sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. -Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris -nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in -reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla -pariatur. Excepteur sint occaecat cupidatat non proident, sunt in -culpa qui officia deserunt mollit anim id est laborum. +long line: Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do= + eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad min= +im veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea = +commodo consequat. Duis aute irure dolor in reprehenderit in voluptate veli= +t esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupi= +datat non proident, sunt in culpa qui officia deserunt mollit anim id est l= +aborum. Yours,=20=20 FixMyStreet.= diff --git a/t/app/helpers/send_email_sample_mime.txt b/t/app/helpers/send_email_sample_mime.txt index 1747204f7..cbfe12b29 100644 --- a/t/app/helpers/send_email_sample_mime.txt +++ b/t/app/helpers/send_email_sample_mime.txt @@ -19,13 +19,13 @@ utf8: =E6=88=91=E4=BB=AC=E5=BA=94=E8=AF=A5=E8=83=BD=E5=A4=9F=E6=97=A0=E7=BC= indented_text -long line: Lorem ipsum dolor sit amet, consectetur adipisicing elit, -sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. -Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris -nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in -reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla -pariatur. Excepteur sint occaecat cupidatat non proident, sunt in -culpa qui officia deserunt mollit anim id est laborum. +long line: Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do= + eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad min= +im veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea = +commodo consequat. Duis aute irure dolor in reprehenderit in voluptate veli= +t esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupi= +datat non proident, sunt in culpa qui officia deserunt mollit anim id est l= +aborum. Yours,=20=20 FixMyStreet.= diff --git a/t/cobrand/zurich_attachments.txt b/t/cobrand/zurich_attachments.txt index bdc4333bf..bf8d6872b 100644 --- a/t/cobrand/zurich_attachments.txt +++ b/t/cobrand/zurich_attachments.txt @@ -14,7 +14,7 @@ Gr=C3=BCezi External Body, =C3=96ffentliche URL: http://www.example.org/report/REPORT_ID -Bei Fragen zu "Z=C3=BCri wie neu" wenden Sie sich bitte an +Bei Fragen zu "Z=C3=BCri wie neu" wenden Sie sich bitte an = gis-zentrum@zuerich.ch.= --BOUNDARY -- cgit v1.2.3