Ticket #7804: E-mail.patch

src/preferences/mail/ConfigWindow.cpp

@@ -898 +898 @@
     item = new AccountItem(label, account, ACCOUNT_ITEM);
     fAccountsListView->AddItem(item);
 
-    item = new AccountItem(B_TRANSLATE("· Incoming"), account, INBOUND_ITEM);
+    item = new AccountItem(B_TRANSLATE("\t\t· Incoming"), account, INBOUND_ITEM);
     fAccountsListView->AddItem(item);
     if (!account->IsInboundEnabled())
         item->SetEnabled(false);
 
-    item = new AccountItem(B_TRANSLATE("· Outgoing"), account,
+    item = new AccountItem(B_TRANSLATE("\t\t· Outgoing"), account,
         OUTBOUND_ITEM);
     fAccountsListView->AddItem(item);
     if (!account->IsOutboundEnabled())
         item->SetEnabled(false);
 
-    item = new AccountItem(B_TRANSLATE("· E-mail filters"), account,
+    item = new AccountItem(B_TRANSLATE("\t\t· E-mail filters"), account,
         FILTER_ITEM);
     fAccountsListView->AddItem(item);
 }

src/servers/mail/StatusWindow.cpp

@@ -481 +481 @@
             strcpy(pre_text,status->TrailingText());
         char final[80];
         if (by_bytes) {
-            sprintf(final,"%.1f / %.1f kb (%d / %d messages)",float(float(status->CurrentValue() + how_much) / 1024),float(float(status->MaxValue()) / 1024),(int)items_now+1,(int)total_items);
+            sprintf(final, B_TRANSLATE("%.1f / %.1f kb (%d / %d messages)"),
+                float(float(status->CurrentValue() + how_much) / 1024),
+                float(float(status->MaxValue()) / 1024),(int)items_now+1,
+                (int)total_items);
             status->Update(how_much,NULL,final);
         } else {
-            sprintf(final,"%d / %d messages",(int)items_now,(int)total_items);
+            sprintf(final, B_TRANSLATE("%d / %d messages"),(int)items_now,
+                (int)total_items);
             status->Update(how_much,NULL,final);
         }
         UnlockLooper();

src/servers/mail/Notifier.cpp

@@ -4 +4 @@
  * Distributed under the terms of the MIT License.
  */
 
+#include <Catalog.h>
 
 #include "Notifier.h"
 
 
+#undef B_TRANSLATE_CONTEXT
+#define B_TRANSLATE_CONTEXT "Notifier"
+
+
 DefaultNotifier::DefaultNotifier(const char* accountName, bool inbound,
     ErrorLogWindow* errorWindow, MailStatusWindow* statusWindow)
     :
@@ -17 +22 @@
     fStatusWindow(statusWindow)
 {
     BString desc;
-    desc += (fIsInbound == true) ? "Fetching" : "Sending";
-    desc += " mail for ";
-    desc += fAccountName;
+    if (fIsInbound == true)
+        desc << B_TRANSLATE("Fetching mail for %name");
+    else
+        desc << B_TRANSLATE("Sending mail for %name");
+    desc.ReplaceFirst("%name", fAccountName);
 
     fStatusWindow->Lock();
     fStatusView = fStatusWindow->NewStatusView(desc, fIsInbound != false);

src/servers/mail/Jamfile

@@ -38 +38 @@
     :
     DeskbarView.cpp
     MailDaemon.cpp
+    Notifier.cpp
     StatusWindow.cpp
 ;