[Spambayes-checkins] spambayes/Outlook2000/dialogs dialog_map.py, 1.47, 1.48

[Kenny Pitt]

Update of /cvsroot/spambayes/spambayes/Outlook2000/dialogs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1926/Outlook2000/dialogs

Modified Files:
	dialog_map.py 
Log Message:
Now that we have more space in the Manager dialog, split the "Filter status"
info into separate lines for better readability.  Also add information about
the setting of the new good message folder option.

Index: dialog_map.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/Outlook2000/dialogs/dialog_map.py,v
retrieving revision 1.47
retrieving revision 1.48
diff -C2 -d -r1.47 -r1.48
*** dialog_map.py	4 Jan 2005 01:53:15 -0000	1.47
--- dialog_map.py	11 Jan 2005 16:23:47 -0000	1.48
***************
*** 175,190 ****
          config = manager.config.filter
          certain_spam_name = manager.FormatFolderNames(
!                                       [config.spam_folder_id], False)
          if config.unsure_folder_id:
              unsure_name = manager.FormatFolderNames(
                                      [config.unsure_folder_id], False)
!             unsure_text = _("unsure managed in '%s'") % (unsure_name,)
          else:
!             unsure_text = _("unsure messages untouched")
  
          watch_names = manager.FormatFolderNames(
                          config.watch_folder_ids, config.watch_include_sub)
!         filter_status = _("Watching '%s'. Spam managed in '%s', %s.") \
                                  % (watch_names,
                                     certain_spam_name,
                                     unsure_text)
--- 175,197 ----
          config = manager.config.filter
          certain_spam_name = manager.FormatFolderNames(
!                                     [config.spam_folder_id], False)
          if config.unsure_folder_id:
              unsure_name = manager.FormatFolderNames(
                                      [config.unsure_folder_id], False)
!             unsure_text = _("Unsure managed in '%s'") % (unsure_name,)
          else:
!             unsure_text = _("Unsure messages untouched")
!         if config.ham_folder_id:
!             ham_name = manager.FormatFolderNames(
!                                     [config.ham_folder_id], False)
!             ham_text = _("Good managed in '%s'") % (ham_name,)
!         else:
!             ham_text = _("Good messages untouched")
  
          watch_names = manager.FormatFolderNames(
                          config.watch_folder_ids, config.watch_include_sub)
!         filter_status = _("Watching '%s'.\r\n%s.\r\nSpam managed in '%s'.\r\n%s.") \
                                  % (watch_names,
+                                    ham_text,
                                     certain_spam_name,
                                     unsure_text)