Aren
/
haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixes #7157. 

- Masked strings are presented in more consistent way;
- Trailing spaces in localized strings are supressed.



git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@40476 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Siarzhuk Zharski 2011-02-13 10:26:06 +00:00
parent 5dbce74310
commit c91a3f0969
2 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/apps/launchbox/App.cpp
View File

@ -54,8 +54,8 @@ App::ReadyToRun()
BMessage windowMessage; BMessage windowMessage;
for (int32 i = 0; settings.FindMessage("window", i, &windowMessage) for (int32 i = 0; settings.FindMessage("window", i, &windowMessage)
>= B_OK; i++) { >= B_OK; i++) {
BString name(B_TRANSLATE("Pad ")); BString name(B_TRANSLATE("Pad"));
name << i + 1; name << " " << i + 1;
BMessage* windowSettings = new BMessage(windowMessage); BMessage* windowSettings = new BMessage(windowMessage);
MainWindow* window = new MainWindow(name.String(), frame, MainWindow* window = new MainWindow(name.String(), frame,
windowSettings); windowSettings);
@ -80,8 +80,8 @@ App::MessageReceived(BMessage* message)
case MSG_ADD_WINDOW: { case MSG_ADD_WINDOW: {
BMessage* settings = new BMessage('sett'); BMessage* settings = new BMessage('sett');
bool wasCloned = message->FindMessage("window", settings) == B_OK; bool wasCloned = message->FindMessage("window", settings) == B_OK;
BString name(B_TRANSLATE("Pad ")); BString name(B_TRANSLATE("Pad"));
name << CountWindows() + 1; name << " " << CountWindows() + 1;
MainWindow* window = new MainWindow(name.String(), MainWindow* window = new MainWindow(name.String(),
BRect(50.0, 50.0, 65.0, 100.0), settings); BRect(50.0, 50.0, 65.0, 100.0), settings);
if (wasCloned) if (wasCloned)

21
src/apps/launchbox/MainWindow.cpp
View File

@ -142,13 +142,14 @@ MainWindow::MessageReceived(BMessage* message)
} else { } else {
status_t ret = be_roster->Launch(button->Ref()); status_t ret = be_roster->Launch(button->Ref());
if (ret < B_OK && ret != B_ALREADY_RUNNING) { if (ret < B_OK && ret != B_ALREADY_RUNNING) {
errorMessage = B_TRANSLATE("Failed to launch '"); BString errStr(B_TRANSLATE("Failed to launch '%1'.\n"
"\nError:"));
BPath path(button->Ref()); BPath path(button->Ref());
if (path.InitCheck() >= B_OK) if (path.InitCheck() >= B_OK)
errorMessage << path.Path(); errStr.ReplaceFirst("%1", path.Path());
else else
errorMessage << button->Ref()->name; errStr.ReplaceFirst("%1", button->Ref()->name);
errorMessage << B_TRANSLATE("'.\n\nError: "); errorMessage << errStr.String() << " ";
errorMessage << strerror(ret); errorMessage << strerror(ret);
} else } else
launchedByRef = true; launchedByRef = true;
@ -157,10 +158,10 @@ MainWindow::MessageReceived(BMessage* message)
if (!launchedByRef && button->AppSignature()) { if (!launchedByRef && button->AppSignature()) {
status_t ret = be_roster->Launch(button->AppSignature()); status_t ret = be_roster->Launch(button->AppSignature());
if (ret != B_OK && ret != B_ALREADY_RUNNING) { if (ret != B_OK && ret != B_ALREADY_RUNNING) {
errorMessage = B_TRANSLATE("Failed to launch application" BString errStr(B_TRANSLATE("Failed to launch application "
" with signature '"); "with signature '%2'.\n\nError:"));
errorMessage << button->AppSignature() << errStr.ReplaceFirst("%2", button->AppSignature());
B_TRANSLATE("'.\n\nError: "); errorMessage << errStr.String() << " ";
errorMessage << strerror(ret); errorMessage << strerror(ret);
} else { } else {
// clear error message on success (might have been // clear error message on success (might have been
@ -212,8 +213,8 @@ MainWindow::MessageReceived(BMessage* message)
// message comes from pad view // message comes from pad view
entry_ref* ref = button->Ref(); entry_ref* ref = button->Ref();
if (ref) { if (ref) {
BString helper(B_TRANSLATE("Description for '")); BString helper(B_TRANSLATE("Description for '%3'"));
helper << ref->name << "'"; helper.ReplaceFirst("%3", ref->name);
make_sure_frame_is_on_screen(fNamePanelFrame, this); make_sure_frame_is_on_screen(fNamePanelFrame, this);
new NamePanel(helper.String(), button->Description(), new NamePanel(helper.String(), button->Description(),
this, this, new BMessage(*message), this, this, new BMessage(*message),