i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Updated to use B_TRANSLATE* macros. relates to #5408.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@36689 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Matt Madia
2010-05-07 00:00:13 +00:00
parent b850bd3b17
commit 16a0078818
3 changed files with 76 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/preferences/mail/Account.cpp
+14 -9
View File
@@ -109,12 +109,15 @@ Account::Account(BMailChain *inbound, BMailChain *outbound)
if (fSettings) if (fSettings)
label << fSettings->Name(); label << fSettings->Name();
else else
label << TR("Unnamed"); label << B_TRANSLATE("Unnamed");
fAccountItem = new AccountItem(label.String(), this, ACCOUNT_ITEM); fAccountItem = new AccountItem(label.String(), this, ACCOUNT_ITEM);
fInboundItem = new AccountItem(TR(" · Incoming"), this, INBOUND_ITEM); fInboundItem =
fOutboundItem = new AccountItem(TR(" · Outgoing"), this, OUTBOUND_ITEM); new AccountItem(B_TRANSLATE(" · Incoming"), this, INBOUND_ITEM);
fFilterItem = new AccountItem(TR(" · E-mail filters"), this, FILTER_ITEM); fOutboundItem =
new AccountItem(B_TRANSLATE(" · Outgoing"), this, OUTBOUND_ITEM);
fFilterItem =
new AccountItem(B_TRANSLATE(" · E-mail filters"), this, FILTER_ITEM);
} }
@@ -264,8 +267,9 @@ void
Account::CreateInbound() Account::CreateInbound()
{ {
if (!(fInbound = NewMailChain())) { if (!(fInbound = NewMailChain())) {
(new BAlert(TR("E-mail"), TR("Could not create inbound chain."), (new BAlert(B_TRANSLATE("E-mail"),
TR("OK")))->Go(); B_TRANSLATE("Could not create inbound chain."),
B_TRANSLATE("OK")))->Go();
return; return;
} }
fInbound->SetChainDirection(inbound); fInbound->SetChainDirection(inbound);
@@ -303,7 +307,7 @@ Account::CreateInbound()
// New Mail Notification // New Mail Notification
path = addOnPath; path = addOnPath;
path.Append(kSystemFilterAddOnPath); path.Append(kSystemFilterAddOnPath);
path.Append(TR("New mail notification")); path.Append(B_TRANSLATE("New mail notification"));
if (!BEntry(path.Path()).Exists()) { if (!BEntry(path.Path()).Exists()) {
find_directory(B_BEOS_ADDONS_DIRECTORY, &path); find_directory(B_BEOS_ADDONS_DIRECTORY, &path);
path.Append(kSystemFilterAddOnPath); path.Append(kSystemFilterAddOnPath);
@@ -333,8 +337,9 @@ void
Account::CreateOutbound() Account::CreateOutbound()
{ {
if (!(fOutbound = NewMailChain())) { if (!(fOutbound = NewMailChain())) {
(new BAlert(TR("E-mail"), TR("Could not create outbound chain."), (new BAlert(B_TRANSLATE("E-mail"),
TR("OK")))->Go(); B_TRANSLATE("Could not create outbound chain."),
B_TRANSLATE("OK")))->Go();
return; return;
} }
fOutbound->SetChainDirection(outbound); fOutbound->SetChainDirection(outbound);
src/preferences/mail/ConfigViews.cpp
+24 -18
View File
@@ -60,7 +60,7 @@ AccountConfigView::AccountConfigView(BRect rect, Account *account)
BBox(rect), BBox(rect),
fAccount(account) fAccount(account)
{ {
SetLabel(TR("Account settings")); SetLabel(B_TRANSLATE("Account settings"));
rect = Bounds().InsetByCopy(8, 8); rect = Bounds().InsetByCopy(8, 8);
rect.top += 10; rect.top += 10;
@@ -76,31 +76,33 @@ AccountConfigView::AccountConfigView(BRect rect, Account *account)
rect = view->Bounds(); rect = view->Bounds();
rect.bottom = height + 5; rect.bottom = height + 5;
float labelWidth = view->StringWidth(TR("Account name:")) + 6; float labelWidth = view->StringWidth(B_TRANSLATE("Account name:")) + 6;
view->AddChild(fNameControl = new BTextControl(rect, NULL, view->AddChild(fNameControl = new BTextControl(rect, NULL,
TR("Account name:"), NULL, new BMessage(kMsgAccountNameChanged))); B_TRANSLATE("Account name:"), NULL,
new BMessage(kMsgAccountNameChanged)));
fNameControl->SetDivider(labelWidth); fNameControl->SetDivider(labelWidth);
view->AddChild(fRealNameControl = new BTextControl(rect, NULL, view->AddChild(fRealNameControl = new BTextControl(rect, NULL,
TR("Real name:"), NULL, NULL)); B_TRANSLATE("Real name:"), NULL, NULL));
fRealNameControl->SetDivider(labelWidth); fRealNameControl->SetDivider(labelWidth);
view->AddChild(fReturnAddressControl = new BTextControl(rect, NULL, view->AddChild(fReturnAddressControl = new BTextControl(rect, NULL,
TR("Return address:"), NULL, NULL)); B_TRANSLATE("Return address:"), NULL, NULL));
fReturnAddressControl->SetDivider(labelWidth); fReturnAddressControl->SetDivider(labelWidth);
// control->TextView()->HideTyping(true); // control->TextView()->HideTyping(true);
BPopUpMenu *chainsPopUp = new BPopUpMenu(B_EMPTY_STRING); BPopUpMenu *chainsPopUp = new BPopUpMenu(B_EMPTY_STRING);
const char *chainModes[] = { const char *chainModes[] = {
TR("Receive mail only"), B_TRANSLATE("Receive mail only"),
TR("Send mail only"), B_TRANSLATE("Send mail only"),
TR("Send and receive mail")}; B_TRANSLATE("Send and receive mail")};
BMenuItem *item; BMenuItem *item;
for (int32 i = 0;i < 3;i++) { for (int32 i = 0;i < 3;i++) {
chainsPopUp->AddItem(item = new BMenuItem(chainModes[i], chainsPopUp->AddItem(item = new BMenuItem(chainModes[i],
new BMessage(kMsgAccountTypeChanged))); new BMessage(kMsgAccountTypeChanged)));
} }
fTypeField = new BMenuField(rect, NULL, TR("Account type:"), chainsPopUp); fTypeField = new BMenuField(rect, NULL, B_TRANSLATE("Account type:"),
chainsPopUp);
fTypeField->SetDivider(labelWidth + 3); fTypeField->SetDivider(labelWidth + 3);
view->AddChild(fTypeField); view->AddChild(fTypeField);
@@ -166,7 +168,8 @@ AccountConfigView::UpdateViews()
if (!fAccount->Inbound() && !fAccount->Outbound()) { if (!fAccount->Inbound() && !fAccount->Outbound()) {
if (BMenuItem *item = fTypeField->Menu()->FindMarked()) if (BMenuItem *item = fTypeField->Menu()->FindMarked())
item->SetMarked(false); item->SetMarked(false);
fTypeField->Menu()->Superitem()->SetLabel(TR("Select account type")); fTypeField->Menu()->Superitem()->SetLabel(
B_TRANSLATE("Select account type"));
fNameControl->SetEnabled(false); fNameControl->SetEnabled(false);
fRealNameControl->SetEnabled(false); fRealNameControl->SetEnabled(false);
@@ -560,13 +563,15 @@ FiltersConfigView::FiltersConfigView(BRect rect, Account *account)
BMenuItem *item; BMenuItem *item;
BMessage *msg; BMessage *msg;
if ((fChain = fAccount->Inbound())) { if ((fChain = fAccount->Inbound())) {
menu->AddItem(item = new BMenuItem(TR("Incoming mail filters"), menu->AddItem(item = new BMenuItem(
B_TRANSLATE("Incoming mail filters"),
msg = new BMessage(kMsgChainSelected))); msg = new BMessage(kMsgChainSelected)));
msg->AddPointer("chain", fChain); msg->AddPointer("chain", fChain);
item->SetMarked(true); item->SetMarked(true);
} }
if (BMailChain *chain = fAccount->Outbound()) { if (BMailChain *chain = fAccount->Outbound()) {
menu->AddItem(item = new BMenuItem(TR("Outgoing mail filters"), menu->AddItem(item = new BMenuItem(
B_TRANSLATE("Outgoing mail filters"),
msg = new BMessage(kMsgChainSelected))); msg = new BMessage(kMsgChainSelected)));
msg->AddPointer("chain", chain); msg->AddPointer("chain", chain);
if (fChain == NULL) { if (fChain == NULL) {
@@ -601,9 +606,9 @@ FiltersConfigView::FiltersConfigView(BRect rect, Account *account)
rect.bottom = rect.top + height; rect.bottom = rect.top + height;
BRect sizeRect = rect; BRect sizeRect = rect;
sizeRect.right = sizeRect.left + 30 sizeRect.right = sizeRect.left + 30
+ fChainsField->StringWidth(TR("Add filter")); + fChainsField->StringWidth(B_TRANSLATE("Add filter"));
menu = new BPopUpMenu(TR("Add filter")); menu = new BPopUpMenu(B_TRANSLATE("Add filter"));
menu->SetRadioMode(false); menu->SetRadioMode(false);
fAddField = new BMenuField(rect, NULL, NULL, menu); fAddField = new BMenuField(rect, NULL, NULL, menu);
@@ -612,9 +617,9 @@ FiltersConfigView::FiltersConfigView(BRect rect, Account *account)
sizeRect.left = sizeRect.right + 5; sizeRect.left = sizeRect.right + 5;
sizeRect.right = sizeRect.left + 30 sizeRect.right = sizeRect.left + 30
+ fChainsField->StringWidth(TR("Remove")); + fChainsField->StringWidth(B_TRANSLATE("Remove"));
sizeRect.top--; sizeRect.top--;
AddChild(fRemoveButton = new BButton(sizeRect, NULL, TR("Remove"), AddChild(fRemoveButton = new BButton(sizeRect, NULL, B_TRANSLATE("Remove"),
new BMessage(kMsgRemoveFilter), B_FOLLOW_BOTTOM)); new BMessage(kMsgRemoveFilter), B_FOLLOW_BOTTOM));
ResizeTo(Bounds().Width(), sizeRect.bottom + 10); ResizeTo(Bounds().Width(), sizeRect.bottom + 10);
@@ -834,8 +839,9 @@ FiltersConfigView::MessageReceived(BMessage *msg)
if (fChain->AddFilter(to, settings, ref) < B_OK) { if (fChain->AddFilter(to, settings, ref) < B_OK) {
(new BAlert("E-mail", (new BAlert("E-mail",
TR("The filter could not be moved. Deleting filter."), B_TRANSLATE("The filter could not be moved. "
TR("OK")))->Go(); "Deleting filter."),
B_TRANSLATE("OK")))->Go();
// the filter view belongs to the moved filter // the filter view belongs to the moved filter
if (fFilterView && fFilterView->fIndex == -1) if (fFilterView && fFilterView->fIndex == -1)
src/preferences/mail/ConfigWindow.cpp
+38 -30
View File
@@ -276,7 +276,7 @@ ConfigWindow::ConfigWindow()
rect = tabView->Bounds(); rect = tabView->Bounds();
rect.bottom -= tabView->TabHeight() + 4; rect.bottom -= tabView->TabHeight() + 4;
tabView->AddTab(view = new BView(rect, NULL, B_FOLLOW_ALL, 0)); tabView->AddTab(view = new BView(rect, NULL, B_FOLLOW_ALL, 0));
tabView->TabAt(0)->SetLabel(TR("Accounts")); tabView->TabAt(0)->SetLabel(B_TRANSLATE("Accounts"));
view->SetViewColor(top->ViewColor()); view->SetViewColor(top->ViewColor());
// accounts listview // accounts listview
@@ -291,13 +291,16 @@ ConfigWindow::ConfigWindow()
rect.top = rect.bottom + 8; rect.bottom = rect.top + height; rect.top = rect.bottom + 8; rect.bottom = rect.top + height;
BRect sizeRect = rect; BRect sizeRect = rect;
sizeRect.right = sizeRect.left + 30 + view->StringWidth(TR("Add")); sizeRect.right = sizeRect.left + 30 + view->StringWidth(
view->AddChild(new BButton(sizeRect, NULL, TR("Add"), B_TRANSLATE("Add"));
view->AddChild(new BButton(sizeRect, NULL, B_TRANSLATE("Add"),
new BMessage(kMsgAddAccount), B_FOLLOW_BOTTOM)); new BMessage(kMsgAddAccount), B_FOLLOW_BOTTOM));
sizeRect.left = sizeRect.right+3; sizeRect.left = sizeRect.right+3;
sizeRect.right = sizeRect.left + 30 + view->StringWidth(TR("Remove")); sizeRect.right = sizeRect.left + 30 + view->StringWidth(
view->AddChild(fRemoveButton = new BButton(sizeRect, NULL, TR("Remove"), B_TRANSLATE("Remove"));
view->AddChild(fRemoveButton = new BButton(
sizeRect, NULL, B_TRANSLATE("Remove"),
new BMessage(kMsgRemoveAccount), B_FOLLOW_BOTTOM)); new BMessage(kMsgRemoveAccount), B_FOLLOW_BOTTOM));
// accounts config view // accounts config view
@@ -313,32 +316,32 @@ ConfigWindow::ConfigWindow()
rect = tabView->Bounds(); rect = tabView->Bounds();
rect.bottom -= tabView->TabHeight() + 4; rect.bottom -= tabView->TabHeight() + 4;
tabView->AddTab(view = new CenterContainer(rect)); tabView->AddTab(view = new CenterContainer(rect));
tabView->TabAt(1)->SetLabel(TR("Settings")); tabView->TabAt(1)->SetLabel(B_TRANSLATE("Settings"));
rect = view->Bounds().InsetByCopy(8, 8); rect = view->Bounds().InsetByCopy(8, 8);
rect.right -= 1; rect.right -= 1;
rect.bottom = rect.top + height * 5 + 15; rect.bottom = rect.top + height * 5 + 15;
BBox *box = new BBox(rect); BBox *box = new BBox(rect);
box->SetLabel(TR("Mail checking")); box->SetLabel(B_TRANSLATE("Mail checking"));
view->AddChild(box); view->AddChild(box);
rect = box->Bounds().InsetByCopy(8, 8); rect = box->Bounds().InsetByCopy(8, 8);
rect.top += 7; rect.top += 7;
rect.bottom = rect.top + height + 5; rect.bottom = rect.top + height + 5;
BRect tile = rect.OffsetByCopy(0, 1); BRect tile = rect.OffsetByCopy(0, 1);
int32 labelWidth = (int32)view->StringWidth(TR("Check every")) + 6; int32 labelWidth = (int32)view->StringWidth(B_TRANSLATE("Check every")) + 6;
tile.right = 80 + labelWidth; tile.right = 80 + labelWidth;
fIntervalControl = new BTextControl(tile, "time", TR("Check every"), NULL, fIntervalControl = new BTextControl(tile, "time",
NULL); B_TRANSLATE("Check every"), NULL, NULL);
fIntervalControl->SetDivider(labelWidth); fIntervalControl->SetDivider(labelWidth);
box->AddChild(fIntervalControl); box->AddChild(fIntervalControl);
BPopUpMenu *frequencyPopUp = new BPopUpMenu(B_EMPTY_STRING); BPopUpMenu *frequencyPopUp = new BPopUpMenu(B_EMPTY_STRING);
const char *frequencyStrings[] = { const char *frequencyStrings[] = {
TR("never"), B_TRANSLATE("never"),
TR("minutes"), B_TRANSLATE("minutes"),
TR("hours"), B_TRANSLATE("hours"),
TR("days")}; B_TRANSLATE("days")};
BMenuItem *item; BMenuItem *item;
for (int32 i = 0; i < 4; i++) { for (int32 i = 0; i < 4; i++) {
frequencyPopUp->AddItem(item = new BMenuItem(frequencyStrings[i], frequencyPopUp->AddItem(item = new BMenuItem(frequencyStrings[i],
@@ -357,28 +360,29 @@ ConfigWindow::ConfigWindow()
rect.OffsetBy(0,height + 9); rect.OffsetBy(0,height + 9);
rect.bottom -= 2; rect.bottom -= 2;
fPPPActiveCheckBox = new BCheckBox(rect, "ppp active", fPPPActiveCheckBox = new BCheckBox(rect, "ppp active",
TR("Only when dial-up is connected"), NULL); B_TRANSLATE("Only when dial-up is connected"), NULL);
box->AddChild(fPPPActiveCheckBox); box->AddChild(fPPPActiveCheckBox);
rect.OffsetBy(0,height + 9); rect.OffsetBy(0,height + 9);
rect.bottom -= 2; rect.bottom -= 2;
fPPPActiveSendCheckBox = new BCheckBox(rect, "ppp activesend", fPPPActiveSendCheckBox = new BCheckBox(rect, "ppp activesend",
TR("Schedule outgoing mail when dial-up is disconnected"), NULL); B_TRANSLATE("Schedule outgoing mail when dial-up is disconnected"),
NULL);
box->AddChild(fPPPActiveSendCheckBox); box->AddChild(fPPPActiveSendCheckBox);
// Miscellaneous settings box // Miscellaneous settings box
rect = box->Frame(); rect.bottom = rect.top + 3 * height + 30; rect = box->Frame(); rect.bottom = rect.top + 3 * height + 30;
box = new BBox(rect); box = new BBox(rect);
box->SetLabel(TR("Miscellaneous")); box->SetLabel(B_TRANSLATE("Miscellaneous"));
view->AddChild(box); view->AddChild(box);
BPopUpMenu *statusPopUp = new BPopUpMenu(B_EMPTY_STRING); BPopUpMenu *statusPopUp = new BPopUpMenu(B_EMPTY_STRING);
const char *statusModes[] = { const char *statusModes[] = {
TR("Never"), B_TRANSLATE("Never"),
TR("While sending"), B_TRANSLATE("While sending"),
TR("While sending and receiving"), B_TRANSLATE("While sending and receiving"),
TR("Always")}; B_TRANSLATE("Always")};
BMessage *msg; BMessage *msg;
for (int32 i = 0; i < 4; i++) { for (int32 i = 0; i < 4; i++) {
statusPopUp->AddItem(item = new BMenuItem(statusModes[i], statusPopUp->AddItem(item = new BMenuItem(statusModes[i],
@@ -391,16 +395,18 @@ ConfigWindow::ConfigWindow()
rect.top += 7; rect.top += 7;
rect.bottom = rect.top + height + 5; rect.bottom = rect.top + height + 5;
labelWidth labelWidth
= (int32)view->StringWidth(TR("Show connection status window:")) + 8; = (int32)view->StringWidth(
B_TRANSLATE("Show connection status window:")) + 8;
fStatusModeField = new BMenuField(rect, "show status", fStatusModeField = new BMenuField(rect, "show status",
TR("Show connection status window:"), statusPopUp); B_TRANSLATE("Show connection status window:"), statusPopUp);
fStatusModeField->SetDivider(labelWidth); fStatusModeField->SetDivider(labelWidth);
box->AddChild(fStatusModeField); box->AddChild(fStatusModeField);
rect = fStatusModeField->Frame();; rect = fStatusModeField->Frame();;
rect.OffsetBy(0, rect.Height() + 10); rect.OffsetBy(0, rect.Height() + 10);
BButton *button = new BButton(rect, B_EMPTY_STRING, BButton *button = new BButton(rect, B_EMPTY_STRING,
TR("Edit mailbox menu…"), msg = new BMessage(B_REFS_RECEIVED)); B_TRANSLATE("Edit mailbox menu…"),
msg = new BMessage(B_REFS_RECEIVED));
button->ResizeToPreferred(); button->ResizeToPreferred();
box->AddChild(button); box->AddChild(button);
button->SetTarget(BMessenger("application/x-vnd.Be-TRAK")); button->SetTarget(BMessenger("application/x-vnd.Be-TRAK"));
@@ -420,7 +426,7 @@ ConfigWindow::ConfigWindow()
rect = button->Frame(); rect = button->Frame();
rect.OffsetBy(rect.Width() + 30,0); rect.OffsetBy(rect.Width() + 30,0);
fAutoStartCheckBox = new BCheckBox(rect, "start daemon", fAutoStartCheckBox = new BCheckBox(rect, "start daemon",
TR("Start mail services on startup"), NULL); B_TRANSLATE("Start mail services on startup"), NULL);
fAutoStartCheckBox->ResizeToPreferred(); fAutoStartCheckBox->ResizeToPreferred();
box->AddChild(fAutoStartCheckBox); box->AddChild(fAutoStartCheckBox);
@@ -431,7 +437,7 @@ ConfigWindow::ConfigWindow()
rect = tabView->Frame(); rect = tabView->Frame();
rect.top = rect.bottom + 5; rect.top = rect.bottom + 5;
rect.bottom = rect.top + height + 5; rect.bottom = rect.top + height + 5;
BButton *saveButton = new BButton(rect, "apply", TR("Apply"), BButton *saveButton = new BButton(rect, "apply", B_TRANSLATE("Apply"),
new BMessage(kMsgSaveSettings)); new BMessage(kMsgSaveSettings));
float w,h; float w,h;
saveButton->GetPreferredSize(&w, &h); saveButton->GetPreferredSize(&w, &h);
@@ -439,7 +445,7 @@ ConfigWindow::ConfigWindow()
saveButton->MoveTo(rect.right - w, rect.top); saveButton->MoveTo(rect.right - w, rect.top);
top->AddChild(saveButton); top->AddChild(saveButton);
BButton *revertButton = new BButton(rect, "revert", TR("Revert"), BButton *revertButton = new BButton(rect, "revert", B_TRANSLATE("Revert"),
new BMessage(kMsgRevertSettings)); new BMessage(kMsgRevertSettings));
revertButton->GetPreferredSize(&w, &h); revertButton->GetPreferredSize(&w, &h);
revertButton->ResizeTo(w,h); revertButton->ResizeTo(w,h);
@@ -507,7 +513,8 @@ ConfigWindow::MakeHowToView()
B_WILL_DRAW); B_WILL_DRAW);
text->SetViewColor(fConfigView->Parent()->ViewColor()); text->SetViewColor(fConfigView->Parent()->ViewColor());
text->SetAlignment(B_ALIGN_CENTER); text->SetAlignment(B_ALIGN_CENTER);
text->SetText(TR("\n\nCreate a new account with the Add button.\n\n" text->SetText(B_TRANSLATE(
"\n\nCreate a new account with the Add button.\n\n"
"Remove an account with the Remove button on the selected item.\n\n" "Remove an account with the Remove button on the selected item.\n\n"
"Select an item in the list to change its settings.")); "Select an item in the list to change its settings."));
rect = text->Bounds(); rect = text->Bounds();
@@ -536,7 +543,7 @@ ConfigWindow::LoadSettings()
// move own window // move own window
MoveTo(settings.ConfigWindowFrame().LeftTop()); MoveTo(settings.ConfigWindowFrame().LeftTop());
} else { } else {
fprintf(stderr, TR("Error retrieving general settings: %s\n"), fprintf(stderr, B_TRANSLATE("Error retrieving general settings: %s\n"),
strerror(status)); strerror(status));
} }
@@ -768,7 +775,8 @@ ConfigWindow::RevertToLastSettings()
status_t status = SetToGeneralSettings(&settings); status_t status = SetToGeneralSettings(&settings);
if (status != B_OK) { if (status != B_OK) {
char text[256]; char text[256];
sprintf(text, TR("\nThe general settings couldn't be reverted.\n\n" sprintf(text, B_TRANSLATE(
"\nThe general settings couldn't be reverted.\n\n"
"Error retrieving general settings:\n%s\n"), "Error retrieving general settings:\n%s\n"),
strerror(status)); strerror(status));
(new BAlert("Error", text, "OK", NULL, NULL, B_WIDTH_AS_USUAL, (new BAlert("Error", text, "OK", NULL, NULL, B_WIDTH_AS_USUAL,