Ticket #7157: launchbox-localization-fix.patch

src/apps/launchbox/PadView.cpp

@@ -353 +353 @@
     }
     menu->AddSeparatorItem();
     // window settings
-    BMenu* settingsM = new BMenu("Settings");
+    BMenu* settingsM = new BMenu(B_TRANSLATE("Settings"));
     settingsM->SetFont(be_plain_font);
 
     const char* toggleLayoutLabel;

src/apps/launchbox/MainWindow.cpp

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

src/apps/launchbox/App.cpp

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