Bug 475511 Rename "Unsent Messages" to "Outbox" in SeaMonkey code r=Mnyromyr

mailnews/base/src/nsMsgFolderDataSource.cpp

@@ -1094,7 +1094,7 @@ nsMsgFolderDataSource::createFolderSpecialNode(nsIMsgFolder *folder,
   else if (flags & nsMsgFolderFlags::Trash)
     specialFolderString.AssignLiteral("Trash");
   else if (flags & nsMsgFolderFlags::Queue)
-    specialFolderString.AssignLiteral("Unsent Messages");
+    specialFolderString.AssignLiteral("Outbox");
   else if (flags & nsMsgFolderFlags::SentMail)
     specialFolderString.AssignLiteral("Sent");
   else if (flags & nsMsgFolderFlags::Drafts)

suite/mailnews/mail3PaneWindowCommands.js

@@ -102,7 +102,7 @@ var FolderPaneController =
 					//dump("specialFolder failure: " + ex + "\n");
 				} 
         if (specialFolder == "Inbox" || specialFolder == "Trash" || specialFolder == "Drafts" ||
-            specialFolder == "Sent" || specialFolder == "Templates" || specialFolder == "Unsent Messages" ||
+            specialFolder == "Sent" || specialFolder == "Templates" || specialFolder == "Outbox" ||
             (specialFolder == "Junk" && !CanRenameDeleteJunkMail(GetSelectedFolderURI())) || isServer)
           canDeleteThisFolder = false;
         else
@@ -849,8 +849,8 @@ function IsSendUnsentMsgsEnabled(folderResource)
 
   if (folderResource &&
       folderResource instanceof Components.interfaces.nsIMsgFolder) {
-    // If unsentMsgsFolder is non-null, it is the "Unsent Messages" folder.
-    // We're here because we've done a right click on the "Unsent Messages"
+    // If unsentMsgsFolder is non-null, it is the "Outbox" folder.
+    // We're here because we've done a right click on the "Outbox"
     // folder (context menu), so we can use the folder and return true/false
     // straight away.
     return folderResource.getTotalMessages(false) > 0;

suite/mailnews/mailContextMenus.js

@@ -280,7 +280,7 @@ function FillFolderPaneContextMenu()
   ShowMenuItem("folderPaneContext-emptyJunk", (numSelected <= 1) && (specialFolder == 'Junk'));
   EnableMenuItem("folderPaneContext-emptyJunk", true);
 
-  var showSendUnsentMessages = (numSelected <= 1) && (specialFolder == 'Unsent Messages');
+  var showSendUnsentMessages = (numSelected <= 1) && (specialFolder == 'Outbox');
   ShowMenuItem("folderPaneContext-sendUnsentMessages", showSendUnsentMessages);
   if (showSendUnsentMessages)
     EnableMenuItem("folderPaneContext-sendUnsentMessages", IsSendUnsentMsgsEnabled(folder));

suite/mailnews/msgMail3PaneWindow.js

@@ -1543,28 +1543,3 @@ function MigrateJunkMailSettings()
     pref.setIntPref("mail.spam.version", 1);
   }
 }
-
-/**
- * Returns a string representation of a folder's specialFolder attribute.
- *
- * @param aFolder The folder whose specialFolder attribute to return.
- */
-function getSpecialFolderString(aFolder) {
-  if (aFolder.flags & 0x1000) // MSG_FOLDER_FLAG_INBOX
-    return "Inbox";
-  if (aFolder.flags & 0x0100) // MSG_FOLDER_FLAG_TRASH
-    return "Trash";
-  if (aFolder.flags & 0x0800) // MSG_FOLDER_FLAG_QUEUE
-    return "Unsent Messages";
-  if (aFolder.flags & 0x0200) // MSG_FOLDER_FLAG_SENTMAIL
-    return "Sent";
-  if (aFolder.flags & 0x0400) // MSG_FOLDER_FLAG_DRAFTS
-    return "Drafts";
-  if (aFolder.flags & 0x400000) // MSG_FOLDER_FLAG_TEMPLATES
-    return "Templates";
-  if (aFolder.flags & 0x40000000) // MSG_FOLDER_FLAG_JUNK
-    return "Junk";
-  if (aFolder.flags & 0x0020) // MSG_FOLDER_FLAG_VIRTUAL
-    return "Virtual";
-  return "none";
-}

suite/themes/classic/messenger/folderMenus.css

@@ -75,11 +75,11 @@ list-style-image: url("chrome://messenger/skin/icons/folder-open.png");
   list-style-image: url("chrome://messenger/skin/icons/folder-sent-open.png");
 }
 
-.folderMenuItem[SpecialFolder="Unsent Messages"] {
+.folderMenuItem[SpecialFolder="Outbox"] {
   list-style-image: url("chrome://messenger/skin/icons/folder-outbox.png");
 }
 
-.folderMenuItem[SpecialFolder="Unsent Messages"][open="true"] {
+.folderMenuItem[SpecialFolder="Outbox"][open="true"] {
   list-style-image: url("chrome://messenger/skin/icons/folder-outbox-open.png");
 }
 

suite/themes/classic/messenger/folderPane.css

@@ -96,12 +96,7 @@ treechildren::-moz-tree-image(folderNameCol, specialFolder-Sent) {
   list-style-image: url("chrome://messenger/skin/icons/folder-sent.png");
 }
 
-/* ..... Unsent ..... */
-
-.tabmail-tab[type="folder"][SpecialFolder="Unsent Messages"],
-treechildren::-moz-tree-image(folderNameCol, specialFolder-Unsent Messages) {
-  list-style-image: url("chrome://messenger/skin/icons/folder-outbox.png");
-}
+/* ..... Outbox ..... */
 
 .tabmail-tab[type="folder"][SpecialFolder="Outbox"],
 treechildren::-moz-tree-image(folderNameCol, specialFolder-Outbox) {

suite/themes/modern/messenger/folderMenus.css

@@ -90,11 +90,11 @@
   list-style-image: url("chrome://messenger/skin/icons/folder-template-open.gif");
 }
 
-.folderMenuItem[SpecialFolder="Unsent Messages"] {
+.folderMenuItem[SpecialFolder="Outbox"] {
   list-style-image: url("chrome://messenger/skin/icons/folder-outbox.gif");
 }
 
-.folderMenuItem[SpecialFolder="Unsent Messages"][open="true"] {
+.folderMenuItem[SpecialFolder="Outbox"][open="true"] {
   list-style-image: url("chrome://messenger/skin/icons/folder-outbox-open.gif");
 }
 

suite/themes/modern/messenger/folderPane.css

@@ -107,12 +107,7 @@ treechildren::-moz-tree-image(folderNameCol, specialFolder-Templates) {
   list-style-image: url("chrome://messenger/skin/icons/folder-template.gif");
 }
 
-/* ..... Unsent Messages ..... */
-
-.tabmail-tab[type="folder"][SpecialFolder="Unsent Messages"],
-treechildren::-moz-tree-image(folderNameCol, specialFolder-Unsent Messages) {
-  list-style-image: url("chrome://messenger/skin/icons/folder-outbox.gif");
-}
+/* ..... Outbox ..... */
 
 .tabmail-tab[type="folder"][SpecialFolder="Outbox"],
 treechildren::-moz-tree-image(folderNameCol, specialFolder-Outbox) {