Ticket #5889: PoseView.patch

PoseView.cpp

@@ -43 +43 @@
 
 #include <Alert.h>
 #include <Application.h>
+#include <Catalog.h>
 #include <Clipboard.h>
 #include <Debug.h>
 #include <Dragger.h>
@@ -51 +52 @@
 #include <Screen.h>
 #include <Query.h>
 #include <List.h>
+#include <Locale.h>
 #include <MenuItem.h>
 #include <NodeMonitor.h>
 #include <Path.h>
@@ -93 +95 @@
 #include "WidthBuffer.h"
 
 
+#undef B_TRANSLATE_CONTEXT
+#define B_TRANSLATE_CONTEXT "libTracker"
+
 using std::min;
 using std::max;
 
@@ -135 +140 @@
     // maximum size of the transparent drag bitmap, use a drag rect
     // if larger in any direction
 
-const char *kNoCopyToTrashStr = "Sorry, you can't copy items to the Trash.";
-const char *kNoLinkToTrashStr = "Sorry, you can't create links in the Trash.";
-const char *kNoCopyToRootStr = "You must drop items on one of the disk icons "
-    "in the \"Disks\" window.";
-const char *kOkToMoveStr = "Are you sure you want to move or copy the selected "
-    "item(s) to this folder?";
 
 struct AddPosesResult {
     ~AddPosesResult();
@@ -574 +573 @@
     if (fColumnList->CountItems() != 0)
         return;
 
-    fColumnList->AddItem(new BColumn("Name", kColumnStart, 145, B_ALIGN_LEFT,
+    fColumnList->AddItem(new BColumn(B_TRANSLATE("Name"), kColumnStart, 145, B_ALIGN_LEFT,
         kAttrStatName, B_STRING_TYPE, true, true));
-    fColumnList->AddItem(new BColumn("Size", 200, 80, B_ALIGN_RIGHT,
+    fColumnList->AddItem(new BColumn(B_TRANSLATE("Size"), 200, 80, B_ALIGN_RIGHT,
         kAttrStatSize, B_OFF_T_TYPE, true, false));
-    fColumnList->AddItem(new BColumn("Modified", 295, 150, B_ALIGN_LEFT,
+    fColumnList->AddItem(new BColumn(B_TRANSLATE("Modified"), 295, 150, B_ALIGN_LEFT,
         kAttrStatModified, B_TIME_TYPE, true, false));
 
     if (!IsWatchingDateFormatChange())
@@ -2510 +2509 @@
     if (CountColumns() == 1) {
         if (runAlert) {
             BAlert *alert = new BAlert("",
-                "You must have at least one attribute showing.",
-                "Cancel", 0, 0, B_WIDTH_AS_USUAL, B_WARNING_ALERT);
+                B_TRANSLATE("You must have at least one attribute showing."),
+                B_TRANSLATE("Cancel"),
+                0, 0, B_WIDTH_AS_USUAL, B_WARNING_ALERT);
             alert->SetShortcut(0, B_ESCAPE);
             alert->Go();
         }
@@ -4083 +4083 @@
         } else if (types)
             description = embedTypeAs;
 
-        const char *labelText;
-        char text[1024];
+        BString labelText;
         if (actionText) {
             int32 length = 1024 - 1 - (int32)strlen(actionText);
             if (length > 0) {
                 description.Truncate(length);
-                sprintf(text, actionText, description.String());
-                labelText = text;
+                labelText.SetTo(actionText);
+                labelText.ReplaceFirst("%s", description.String());
             } else
-                labelText = "label too long";
+                labelText.SetTo(B_TRANSLATE("label too long"));
         } else
-            labelText = description.String();
+            labelText = description;
 
-        menu->AddItem(new BMenuItem(labelText, 0));
+        menu->AddItem(new BMenuItem(labelText.String(), 0));
     }
 
     menu->AddSeparatorItem();
-    menu->AddItem(new BMenuItem("Cancel", 0));
+    menu->AddItem(new BMenuItem(B_TRANSLATE("Cancel"), 0));
 
     int32 result = -1;
     BMenuItem *resultingItem = menu->Go(where, false, true);
@@ -4254 +4253 @@
                         if (specificActionIndex == -1)
                             return false;
                     } else if (types.CountItems() > 0) {
-                        specificTypeIndex = RunMimeTypeDestinationMenu("Create %s clipping",
+                        specificTypeIndex = RunMimeTypeDestinationMenu(
+                            B_TRANSLATE("Create %s clipping"),
                             &types, &typeNames, view->ConvertToScreen(dropPt));
 
                         if (specificTypeIndex == -1)
@@ -4720 +4720 @@
     bool okToMove = true;
 
     if (destFolder->IsRoot()) {
-        BAlert *alert = new BAlert("", kNoCopyToRootStr, "Cancel",
+        BAlert *alert = new BAlert("",
+            B_TRANSLATE("You must drop items on one of the disk icons "
+            "in the \"Disks\" window."),
+            B_TRANSLATE("Cancel"),
             NULL, NULL, B_WIDTH_AS_USUAL, B_WARNING_ALERT);
         alert->SetShortcut(0, B_ESCAPE);
         alert->Go();
@@ -4729 +4732 @@
 
     // can't copy items into the trash
     if (forceCopy && destIsTrash) {
-        BAlert *alert = new BAlert("", kNoCopyToTrashStr, "Cancel",
+        BAlert *alert = new BAlert("",
+            B_TRANSLATE("Sorry, you can't copy items to the Trash."),
+            B_TRANSLATE("Cancel"),
             NULL, NULL, B_WIDTH_AS_USUAL, B_WARNING_ALERT);
         alert->SetShortcut(0, B_ESCAPE);
         alert->Go();
@@ -4738 +4743 @@
 
     // can't create symlinks into the trash
     if (createLink && destIsTrash) {
-        BAlert *alert = new BAlert("", kNoLinkToTrashStr, "Cancel",
+        BAlert *alert = new BAlert("",
+            B_TRANSLATE("Sorry, you can't create links in the Trash."),
+            B_TRANSLATE("Cancel"),
             NULL, NULL, B_WIDTH_AS_USUAL, B_WARNING_ALERT);
         alert->SetShortcut(0, B_ESCAPE);
         alert->Go();
@@ -4749 +4756 @@
     if (srcWindow->TargetModel()->IsQuery()
         && !forceCopy && !destIsTrash && !createLink) {
         srcWindow->UpdateIfNeeded();
-        BAlert *alert = new BAlert("", kOkToMoveStr, "Cancel",
-            "Move", NULL, B_WIDTH_AS_USUAL, B_WARNING_ALERT);
+        BAlert *alert = new BAlert("", 
+            B_TRANSLATE("Are you sure you want to move or copy the selected "
+            "item(s) to this folder?"),
+            B_TRANSLATE("Cancel"),
+            B_TRANSLATE("Move"),
+            NULL, B_WIDTH_AS_USUAL, B_WARNING_ALERT);
         alert->SetShortcut(0, B_ESCAPE);
         okToMove = alert->Go() == 1;
     }
@@ -5610 +5621 @@
 {
     BVolume volume (ref->device);
     if (volume.IsReadOnly()) {
-        BAlert *alert = new BAlert ("", "Files cannot be moved or "
-            "deleted from a read-only volume.", "Cancel", NULL,
-            NULL, B_WIDTH_AS_USUAL, B_STOP_ALERT);
+        BAlert *alert = new BAlert ("",
+            B_TRANSLATE("Files cannot be moved or "
+            "deleted from a read-only volume."),
+            B_TRANSLATE("Cancel"),
+            NULL, NULL, B_WIDTH_AS_USUAL, B_STOP_ALERT);
         alert->SetShortcut(0, B_ESCAPE);
         alert->Go();
         return false;
@@ -5650 +5663 @@
     }
 
     if (entriesToDeleteOnTheSpot->CountItems()) {
-        const char *alertText;
+        BString alertText;
         if (ref) {
-            alertText = "The selected item cannot be moved to the Trash. "
+            alertText.SetTo(B_TRANSLATE("The selected item cannot be moved to the Trash. "
                 "Would you like to delete it instead? (This operation cannot "
-                "be reverted.)";
+                "be reverted.)"));
         } else {
-            alertText = "Some of the selected items cannot be moved to the Trash. "
+            alertText.SetTo(B_TRANSLATE("Some of the selected items cannot be moved to the Trash. "
                 "Would you like to delete them instead? (This operation cannot "
-                "be reverted.)";
+                "be reverted.)"));
         }
 
-        BAlert *alert = new BAlert("", alertText, "Cancel", "Delete");
+        BAlert *alert = new BAlert("", alertText.String(),
+            B_TRANSLATE("Cancel"),
+            B_TRANSLATE("Delete"));
         alert->SetShortcut(0, B_ESCAPE);
         if (alert->Go() == 0)
             return;
@@ -5950 +5965 @@
 
         if (regExpression.InitCheck() != B_OK) {
             BString message;
-            message << "Error in regular expression:\n\n'";
+            message << B_TRANSLATE("Error in regular expression:\n\n'");
             message << regExpression.ErrorString() << "'";
-            (new BAlert("", message.String(), "OK", NULL, NULL, B_WIDTH_AS_USUAL,
+            (new BAlert("", message.String(), B_TRANSLATE("OK"), NULL, NULL, B_WIDTH_AS_USUAL,
                 B_STOP_ALERT))->Go();
             return 0;
         }
@@ -7869 +7884 @@
 {
     BMessenger tracker(kTrackerSignature);
     if (!tracker.IsValid()) {
-        BAlert *alert = new BAlert("", "The Tracker must be running "
-            "to see Info windows.", "Cancel", NULL, NULL,
-            B_WIDTH_AS_USUAL, B_WARNING_ALERT);
+        BAlert *alert = new BAlert("",
+            B_TRANSLATE("The Tracker must be running to see Info windows."),
+            B_TRANSLATE("Cancel"),
+            NULL, NULL, B_WIDTH_AS_USUAL, B_WARNING_ALERT);
         alert->SetShortcut(0, B_ESCAPE);
         alert->Go();
         return;
@@ -7885 +7901 @@
 {
     BMessenger tracker(kTrackerSignature);
     if (!tracker.IsValid()) {
-        BAlert *alert = new BAlert("", "The Tracker must be running "
-            "to see set the default printer.", "Cancel", NULL,
-            NULL, B_WIDTH_AS_USUAL, B_WARNING_ALERT);
+        BAlert *alert = new BAlert("",
+            B_TRANSLATE("The Tracker must be running to see set the default printer."),
+            B_TRANSLATE("Cancel"),
+            NULL, NULL, B_WIDTH_AS_USUAL, B_WARNING_ALERT);
         alert->SetShortcut(0, B_ESCAPE);
         alert->Go();
         return;