Patch for sending mail with aws - ascii encoding problem

2023-03-17 16:00:35 +01:00 · 2023-03-17 16:00:35 +01:00 · 6b7de9a4a3
parent c1c635a324
commit 6b7de9a4a3
1 changed files with 13 additions and 0 deletions
--- a/images/ckan/2.9/patches/03_patch_smtp_aws_sent_from.patch
+++ b/images/ckan/2.9/patches/03_patch_smtp_aws_sent_from.patch
@ -0,0 +1,13 @@
+diff --git a/ckan/lib/mailer.py b/ckan/lib/mailer.py
+index dc83eb0f1..b9839a70d 100644
+--- a/ckan/lib/mailer.py
+++ b/ckan/lib/mailer.py
+@@ -55,7 +55,7 @@ def _mail_recipient(recipient_name, recipient_email,
+             msg.add_header(k, v)
+     subject = Header(subject.encode('utf-8'), 'utf-8')
+     msg['Subject'] = subject
+-    msg['From'] = _("%s <%s>") % (sender_name, mail_from)
+    msg['From'] = _("%s <%s>") % ('CKAN', mail_from)
+     msg['To'] = u"%s <%s>" % (recipient_name, recipient_email)
+     msg['Date'] = utils.formatdate(time())
+     msg['X-Mailer'] = "CKAN %s" % ckan.__version__