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

source_changes at macosforge.org source_changes at macosforge.org
Thu Aug 11 21:38:16 PDT 2011


Revision: 7890
          http://trac.macosforge.org/projects/calendarserver/changeset/7890
Author:   glyph at apple.com
Date:     2011-08-11 21:38:16 -0700 (Thu, 11 Aug 2011)
Log Message:
-----------
dedent translationTo block since translation is now done elsewhere

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:05 UTC (rev 7889)
+++ CalendarServer/branches/users/glyph/imip-and-admin-html/twistedcaldav/mail.py	2011-08-12 04:38:16 UTC (rev 7890)
@@ -1266,24 +1266,22 @@
 
         details.update(labels)
 
-        with translationTo(language):
+        msgAlt = MIMEMultipart("alternative")
+        msg.attach(msgAlt)
 
-            msgAlt = MIMEMultipart("alternative")
-            msg.attach(msgAlt)
+        plainText = self.renderPlainText(details, (orgCN, orgEmail),
+                                         attendees, canceled)
+        msgPlain = MIMEText(plainText.encode("UTF-8"), "plain", "UTF-8")
+        msgAlt.attach(msgPlain)
 
-            plainText = self.renderPlainText(details, (orgCN, orgEmail),
-                                             attendees, canceled)
-            msgPlain = MIMEText(plainText.encode("UTF-8"), "plain", "UTF-8")
-            msgAlt.attach(msgPlain)
+        # html version
+        msgHtmlRelated = MIMEMultipart("related", type="text/html")
+        msgAlt.attach(msgHtmlRelated)
 
-            # html version
-            msgHtmlRelated = MIMEMultipart("related", type="text/html")
-            msgAlt.attach(msgHtmlRelated)
+        addIcon, htmlText = self.renderHTML(
+            details, (orgCN, orgEmail), attendees, canceled
+        )
 
-            addIcon, htmlText = self.renderHTML(
-                details, (orgCN, orgEmail), attendees, canceled
-            )
-
         msgHtml = MIMEText(htmlText.encode("UTF-8"), "html", "UTF-8")
         msgHtmlRelated.attach(msgHtml)
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20110811/0605310f/attachment.html>


More information about the calendarserver-changes mailing list