Revision: 9261 http://trac.macosforge.org/projects/calendarserver/changeset/9261 Author: sagen@apple.com Date: 2012-05-21 14:54:25 -0700 (Mon, 21 May 2012) Log Message: ----------- Update email template and localization file paths, and fix non-ascii localization. Uses Japanese for outbound IMIP unit test. Modified Paths: -------------- CalendarServer/trunk/locales/pig/LC_MESSAGES/calendarserver.mo CalendarServer/trunk/twistedcaldav/mail.py CalendarServer/trunk/twistedcaldav/stdconfig.py CalendarServer/trunk/twistedcaldav/test/test_mail.py Added Paths: ----------- CalendarServer/trunk/twistedcaldav/test/locales/ CalendarServer/trunk/twistedcaldav/test/locales/ja/ CalendarServer/trunk/twistedcaldav/test/locales/ja/LC_MESSAGES/ CalendarServer/trunk/twistedcaldav/test/locales/ja/LC_MESSAGES/calendarserver.mo Modified: CalendarServer/trunk/locales/pig/LC_MESSAGES/calendarserver.mo =================================================================== (Binary files differ) Modified: CalendarServer/trunk/twistedcaldav/mail.py =================================================================== --- CalendarServer/trunk/twistedcaldav/mail.py 2012-05-21 20:04:10 UTC (rev 9260) +++ CalendarServer/trunk/twistedcaldav/mail.py 2012-05-21 21:54:25 UTC (rev 9261) @@ -1659,7 +1659,7 @@ results = {} - dtStart = component.propertyValue("DTSTART") + dtStart = component.propertyValue('DTSTART') results['month'] = dtStart.getMonth() results['day'] = dtStart.getDay() @@ -1672,17 +1672,17 @@ results[propertyToResult] = result with translationTo(language) as trans: - results['dateInfo'] = trans.date(component) - results['timeInfo'], duration = trans.time(component) - results['durationInfo'] = "(%s)" % (duration,) if duration else "" + results['dateInfo'] = trans.date(component).decode('utf-8') + results['timeInfo'], duration = (x.decode('utf-8') for x in trans.time(component)) + results['durationInfo'] = u"(%s)" % (duration,) if duration else u"" - for propertyName in ("RRULE", "RDATE", "EXRULE", "EXDATE", - "RECURRENCE-ID"): + for propertyName in ('RRULE', 'RDATE', 'EXRULE', 'EXDATE', + 'RECURRENCE-ID'): if component.hasProperty(propertyName): - results['recurrenceInfo'] = _("(Repeating)") + results['recurrenceInfo'] = _("(Repeating)").decode('utf-8') break else: - results['recurrenceInfo'] = "" + results['recurrenceInfo'] = u"" return results Modified: CalendarServer/trunk/twistedcaldav/stdconfig.py =================================================================== --- CalendarServer/trunk/twistedcaldav/stdconfig.py 2012-05-21 20:04:10 UTC (rev 9260) +++ CalendarServer/trunk/twistedcaldav/stdconfig.py 2012-05-21 21:54:25 UTC (rev 9261) @@ -636,8 +636,8 @@ "Password" : "", # For account receiving mail }, "AddressPatterns" : [], # Regex patterns to match iMIP-able calendar user addresses - "MailTemplatesDirectory": "/usr/share/caldavd/share/email_templates", # Directory containing HTML templates for email invitations (invite.html, cancel.html) - "MailIconsDirectory": "/usr/share/caldavd/share/date_icons", # Directory containing language-specific subdirectories containing date-specific icons for email invitations + "MailTemplatesDirectory": "/Applications/Server.app/Contents/ServerRoot/usr/share/caldavd/share/email_templates", # Directory containing HTML templates for email invitations (invite.html, cancel.html) + "MailIconsDirectory": "/Applications/Server.app/Contents/ServerRoot/usr/share/caldavd/share/date_icons", # Directory containing language-specific subdirectories containing date-specific icons for email invitations "InvitationDaysToLive" : 90, # How many days invitations are valid }, @@ -797,8 +797,8 @@ # Localization # "Localization" : { - "TranslationsDirectory" : "/usr/share/caldavd/share/translations", - "LocalesDirectory" : "/usr/share/caldavd/share/locales", + "TranslationsDirectory" : "/Applications/Server.app/Contents/ServerRoot/usr/share/caldavd/share/translations", + "LocalesDirectory" : "/Applications/Server.app/Contents/ServerRoot/usr/share/caldavd/share/locales", "Language" : "en", }, Added: CalendarServer/trunk/twistedcaldav/test/locales/ja/LC_MESSAGES/calendarserver.mo =================================================================== (Binary files differ) Property changes on: CalendarServer/trunk/twistedcaldav/test/locales/ja/LC_MESSAGES/calendarserver.mo ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Modified: CalendarServer/trunk/twistedcaldav/test/test_mail.py =================================================================== --- CalendarServer/trunk/twistedcaldav/test/test_mail.py 2012-05-21 20:04:10 UTC (rev 9260) +++ CalendarServer/trunk/twistedcaldav/test/test_mail.py 2012-05-21 21:54:25 UTC (rev 9261) @@ -35,6 +35,7 @@ from twistedcaldav.test.util import xmlFile, augmentsFile import datetime import email +import os from pycalendar.datetime import PyCalendarDateTime @@ -483,6 +484,7 @@ """ config.Scheduling.iMIP.Sending.Address = "server@example.com" + self.patch(config.Localization, "LocalesDirectory", os.path.join(os.path.dirname(__file__), "locales")) data = ( # Initial invite @@ -578,6 +580,7 @@ inputOriginator, inputRecipient, Component.fromString(inputCalendar.replace("\n", "\r\n")), + language="ja", send=False, onlyAfter=PyCalendarDateTime(2010, 1, 1, 0, 0, 0)) )