[CalendarServer-changes] [7892] CalendarServer/branches/users/glyph/imip-and-admin-html/ twistedcaldav/mail.py

[source_changes at macosforge.org]

Revision: 7892
          http://trac.macosforge.org/projects/calendarserver/changeset/7892
Author:   glyph at apple.com
Date:     2011-08-11 21:38:38 -0700 (Thu, 11 Aug 2011)
Log Message:
-----------
finish separating everything out; fill out details, then render parts, then construct MIME

Modified Paths:
--------------
    CalendarServer/branches/users/glyph/imip-and-admin-html/twistedcaldav/mail.py

Modified: CalendarServer/branches/users/glyph/imip-and-admin-html/twistedcaldav/mail.py
===================================================================
--- CalendarServer/branches/users/glyph/imip-and-admin-html/twistedcaldav/mail.py	2011-08-12 04:38:27 UTC (rev 7891)
+++ CalendarServer/branches/users/glyph/imip-and-admin-html/twistedcaldav/mail.py	2011-08-12 04:38:38 UTC (rev 7892)
@@ -1245,37 +1245,31 @@
         canceled = (calendar.propertyValue("METHOD") == "CANCEL")
         iconPath = self.getIconPath(details, canceled, language=language)
 
+        subjectFormat, labels = localizedLabels(language, canceled, inviteState)
+        details.update(labels)
+
+        details['subject'] = subjectFormat % {'summary' : details['summary']}
+        details['iconName'] = iconName = "calicon.png"
+
+        plainText = self.renderPlainText(details, (orgCN, orgEmail),
+                                         attendees, canceled)
+
+        [addIcon, htmlText] = self.renderHTML(details, (orgCN, orgEmail),
+                                              attendees, canceled)
+
         msg = MIMEMultipart()
         msg["From"] = fromAddress
+        msg["Subject"] = details['subject']
         msg["Reply-To"] = replyToAddress
         msg["To"] = toAddress
         msg["Date"] = rfc822date()
         msgId = messageid()
         msg["Message-ID"] = msgId
 
-        subjectFormat, labels = localizedLabels(language, canceled, inviteState)
-
-        # The translations we get back from gettext are utf-8 encoded strings,
-        # so convert to unicode.
-
-        details['subject'] = msg['Subject'] = subjectFormat % {
-            'summary' : details['summary']
-        }
-
-        details['iconName'] = iconName = "calicon.png"
-
-        details.update(labels)
-
-        plainText = self.renderPlainText(
-            details, (orgCN, orgEmail), attendees, canceled
-        )
-        addIcon, htmlText = self.renderHTML(
-            details, (orgCN, orgEmail), attendees, canceled
-        )
-
         msgAlt = MIMEMultipart("alternative")
         msg.attach(msgAlt)
 
+        # plain version
         msgPlain = MIMEText(plainText.encode("UTF-8"), "plain", "UTF-8")
         msgAlt.attach(msgPlain)
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20110811/5d70fbc7/attachment-0001.html>