From 8a26696cbfd5c7ec650c580ceb7fbff02d3dfbb9 Mon Sep 17 00:00:00 2001 From: Clemens Zeidler Date: Thu, 23 Jun 2011 19:59:00 +0000 Subject: [PATCH] Patch by mt who also puts the Japanese mail translation into HTA. Thanks! Closes #7689. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@42293 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- .../inbound_filters/notifier/filter.cpp | 14 +++++++------- src/servers/mail/MailDaemon.cpp | 11 +++++++---- 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/src/add-ons/mail_daemon/inbound_filters/notifier/filter.cpp b/src/add-ons/mail_daemon/inbound_filters/notifier/filter.cpp index 1945eb1260..329143c21c 100644 --- a/src/add-ons/mail_daemon/inbound_filters/notifier/filter.cpp +++ b/src/add-ons/mail_daemon/inbound_filters/notifier/filter.cpp @@ -67,15 +67,15 @@ NotifyFilter::MailboxSynced(status_t status) system_beep("New E-mail"); if (fStrategy & alert) { - BString text; + BString text, numString; if (fNNewMessages != 1) - text << B_TRANSLATE("You have ") << fNNewMessages << B_TRANSLATE( - " new messages") << B_TRANSLATE(" for ") - << fMailProtocol.AccountSettings().Name() << "."; + text << B_TRANSLATE("You have %num new messages for %name."); else - text << B_TRANSLATE("You have ") << fNNewMessages << B_TRANSLATE( - " new message") << B_TRANSLATE(" for ") - << fMailProtocol.AccountSettings().Name() << "."; + text << B_TRANSLATE("You have %num new message for %name."); + + numString << fNNewMessages; + text.ReplaceFirst("%num", numString); + text.ReplaceFirst("%name", fMailProtocol.AccountSettings().Name()); BAlert *alert = new BAlert(B_TRANSLATE("New messages"), text.String(), "OK", NULL, NULL, B_WIDTH_AS_USUAL); diff --git a/src/servers/mail/MailDaemon.cpp b/src/servers/mail/MailDaemon.cpp index ff86af53c7..cad3746648 100644 --- a/src/servers/mail/MailDaemon.cpp +++ b/src/servers/mail/MailDaemon.cpp @@ -517,13 +517,16 @@ MailDaemonApp::MessageReceived(BMessage* msg) case 'numg': { int32 numMessages = msg->FindInt32("num_messages"); + BString numString; + if (numMessages > 1) - fAlertString << numMessages << B_TRANSLATE(" new messages"); + fAlertString << B_TRANSLATE("%num new messages for %name\n"); else - fAlertString << numMessages << B_TRANSLATE(" new message"); + fAlertString << B_TRANSLATE("%num new message for %name\n"); - fAlertString << B_TRANSLATE(" for ") << msg->FindString("name") - << '\n'; + numString << numMessages; + fAlertString.ReplaceFirst("%num", numString); + fAlertString.ReplaceFirst("%name", msg->FindString("name")); break; }