- Revision
- 15910
- Author
- vajda
- Date
- 2007-11-26 15:23:58 -0800 (Mon, 26 Nov 2007)
Log Message
merged with trunk:15909
Modified Paths
- branches/64/chandler/application/dialogs/AccountPreferences.py
- branches/64/chandler/application/dialogs/AccountPreferencesDialogs.py
- branches/64/chandler/application/dialogs/SubscribeCollection.py
- branches/64/chandler/parcels/osaf/mail/constants.py
- branches/64/chandler/parcels/osaf/mail/imap.py
- branches/64/chandler/parcels/osaf/views/main/menus.py
Diff
Modified: branches/64/chandler/application/dialogs/AccountPreferences.py (15909 => 15910)
--- branches/64/chandler/application/dialogs/AccountPreferences.py 2007-11-26 22:21:42 UTC (rev 15909) +++ branches/64/chandler/application/dialogs/AccountPreferences.py 2007-11-26 23:23:58 UTC (rev 15910) @@ -66,22 +66,24 @@ # --- Yes No Dialog Messages ----- # CREATE_FOLDERS_TITLE = _(u"Configure Chandler Folders") + CREATE_FOLDERS = _(u"""Chandler will attempt to create the following IMAP folders in your account on '%(host)s': - Chandler Events - Chandler Mail - Chander Tasks + %(ChandlerMailFolder)s + %(ChandlerTasksFolder)s + %(ChandlerEventsFolder)s If you have already set up Chandler folders in your account, no new folders will be created. Folders may take a while to show up in your email application.""") + REMOVE_FOLDERS_TITLE = _(u"Remove Chandler Folders") REMOVE_FOLDERS = _(u"""Chandler will now attempt to remove the following IMAP folders on '%(host)s': - Chandler Mail - Chander Tasks - Chandler Events + %(ChandlerMailFolder)s + %(ChandlerTasksFolder)s + %(ChandlerEventsFolder)s Would you like to proceed?""") @@ -1566,14 +1568,24 @@ if create: config = showConfigureDialog(CREATE_FOLDERS_TITLE, - CREATE_FOLDERS % {'host': account.host}, + CREATE_FOLDERS % { + "host": account.host, + "ChandlerMailFolder": constants.CHANDLER_MAIL_FOLDER, + "ChandlerTasksFolder": constants.CHANDLER_TASKS_FOLDER, + "ChandlerEventsFolder": constants.CHANDLER_EVENTS_FOLDER, + }, self) if config: ChandlerIMAPFoldersDialog(self, account, self.OnFolderCreation) else: yes = showYesNoDialog(REMOVE_FOLDERS_TITLE, - REMOVE_FOLDERS % {'host': account.host}, + REMOVE_FOLDERS % { + "host": account.host, + "ChandlerMailFolder": constants.CHANDLER_MAIL_FOLDER, + "ChandlerTasksFolder": constants.CHANDLER_TASKS_FOLDER, + "ChandlerEventsFolder": constants.CHANDLER_EVENTS_FOLDER, + }, self) if yes:
Modified: branches/64/chandler/application/dialogs/AccountPreferencesDialogs.py (15909 => 15910)
--- branches/64/chandler/application/dialogs/AccountPreferencesDialogs.py 2007-11-26 22:21:42 UTC (rev 15909) +++ branches/64/chandler/application/dialogs/AccountPreferencesDialogs.py 2007-11-26 23:23:58 UTC (rev 15910) @@ -238,15 +238,19 @@ return _(u"""\ The following folders have been created in your account: -Chandler Mail - Add messages to this folder to add them to your Mail Dashboard. +%(ChandlerMailFolder)s - Add messages to this folder to add them to your Mail Dashboard. -Chandler Tasks - Add messages to this folder to add them to your Tasks Dashboard. +%(ChandlerTasksFolder)s - Add messages to this folder to add them to your Tasks Dashboard. -Chandler Events - Add messages to this folder to add them to your Calendar Dashboard. Chandler will do its best to makes sense of any date and time information in the message. +%(ChandlerEventsFolder)s - Add messages to this folder to add them to your Calendar Dashboard. Chandler will do its best to makes sense of any date and time information in the message. All messages added to Chandler folders will show up in your All Dashboard. -Note: Chandler folders may take a while to appear in your email application.""") +Note: Chandler folders may take a while to appear in your email application.""") % { + "ChandlerMailFolder": constants.CHANDLER_MAIL_FOLDER, + "ChandlerTasksFolder": constants.CHANDLER_TASKS_FOLDER, + "ChandlerEventsFolder": constants.CHANDLER_EVENTS_FOLDER, + } else: return _(u"You have already set up Chandler folders in this account. No new folders were created.")
Modified: branches/64/chandler/application/dialogs/SubscribeCollection.py (15909 => 15910)
--- branches/64/chandler/application/dialogs/SubscribeCollection.py 2007-11-26 22:21:42 UTC (rev 15909) +++ branches/64/chandler/application/dialogs/SubscribeCollection.py 2007-11-26 23:23:58 UTC (rev 15910) @@ -147,7 +147,7 @@ # Put this collection into "My items" if not checked: if not self.checkboxKeepOut.GetValue() or self.mine: logger.info(_(u'Moving collection into Dashboard...')) - schema.ns('osaf.pim', taskView.view).mine.addSource(collection) + schema.ns('osaf.pim', self.taskView).mine.addSource(collection) schema.ns("osaf.app", self.taskView).sidebarCollection.add(collection)
Modified: branches/64/chandler/parcels/osaf/mail/constants.py (15909 => 15910)
--- branches/64/chandler/parcels/osaf/mail/constants.py 2007-11-26 22:21:42 UTC (rev 15909) +++ branches/64/chandler/parcels/osaf/mail/constants.py 2007-11-26 23:23:58 UTC (rev 15910) @@ -24,9 +24,13 @@ CHANDLER_USERAGENT = "Chandler (%s)" % version.version CHANDLER_HEADER_PREFIX = "X-Chandler-" -CHANDLER_MAIL_FOLDER = _(u"Chandler Mail") -CHANDLER_TASKS_FOLDER = _(u"Chandler Tasks") -CHANDLER_EVENTS_FOLDER = _(u"Chandler Events") +#XXX For 0.7.3 the Chandler IMAP Folders will not +# be localized since there are potential issues +# when switching languages. For information see +# bug 11430. +CHANDLER_MAIL_FOLDER = u"Chandler Mail" +CHANDLER_TASKS_FOLDER = u"Chandler Tasks" +CHANDLER_EVENTS_FOLDER = u"Chandler Events" INVALID_EMAIL_ADDRESS = _(u"Email Address %(emailAddress)s is not valid.")
Modified: branches/64/chandler/parcels/osaf/mail/imap.py (15909 => 15910)
--- branches/64/chandler/parcels/osaf/mail/imap.py 2007-11-26 22:21:42 UTC (rev 15909) +++ branches/64/chandler/parcels/osaf/mail/imap.py 2007-11-26 23:23:58 UTC (rev 15910) @@ -377,12 +377,15 @@ e = constants.CHANDLER_EVENTS_FOLDER status = { - #pos 0: The Unicode name of the folder on the IMAP Server + #pos 0: The Unicode name of the folder on the IMAP Server. + # The values in m, t, and e are of type i18n.Message. + # They need to be converted to Unicode to be saved in + # the IMAPFolder.folderName attribute of type schema.Text. #pos 1: Boolean whether to folder exists on the server already #pos 2: Boolean whether the folder is currently subscribe to already - m: [m, False, False], - t: [t, False, False], - e: [e, False, False] + m: [unicode(m), False, False], + t: [unicode(t), False, False], + e: [unicode(e), False, False] } d = self.proto.list("", "INBOX")
Modified: branches/64/chandler/parcels/osaf/views/main/menus.py (15909 => 15910)
--- branches/64/chandler/parcels/osaf/views/main/menus.py 2007-11-26 22:21:42 UTC (rev 15909) +++ branches/64/chandler/parcels/osaf/views/main/menus.py 2007-11-26 23:23:58 UTC (rev 15910) @@ -244,7 +244,7 @@ ]), # Menu OfflineMenu MenuItem.template('SyncManagerItem', event = main.SyncManager, - title = _(u'Sync Manager...'), + title = _(u'Sync &Manager...'), helpString = _(u'Open the Sync Manager dialog')), MenuItem.template('FileSeparator4', menuItemKind = 'Separator'),
_______________________________________________ Commits mailing list [email protected] http://lists.osafoundation.org/mailman/listinfo/commits
