Ticket #6063: mount_serverLocalization.patch

src/servers/mount/AutoMounter.cpp

@@ -12 +12 @@
 
 #include <Alert.h>
 #include <AutoLocker.h>
+#include <Catalog.h>
 #include <Debug.h>
 #include <Directory.h>
 #include <DiskDevice.h>
@@ -22 +23 @@
 #include <FindDirectory.h>
 #include <fs_info.h>
 #include <fs_volume.h>
+#include <Locale.h>
 #include <Message.h>
 #include <Node.h>
 #include <NodeMonitor.h>
@@ -34 +36 @@
 #include "MountServer.h"
 
 
+#define B_TRANSLATE_CONTEXT "AutoMounter"
+
+
 static const char* kMountServerSettings = "mount_server";
 static const uint32 kMsgInitialScan = 'insc';
 static const char* kMountFlagsKeyExtension = " mount flags";
@@ -328 +333 @@
     switch (message->what) {
         case B_EXECUTE_PROPERTY:
             if (strcmp("InitialScan", property) == 0) {
-printf("performing initial scan.\n");
+                printf(B_TRANSLATE("performing initial scan.\n"));
                 _MountVolumes(fNormalMode, fRemovableMode, true);
-                err = reply.AddString("result", "Previous volumes mounted.");
+                err = reply.AddString("result", B_TRANSLATE("Previous volumes mounted."));
             }
             break;
     }
@@ -378 +383 @@
     if (askReadOnly) {
         // Suggest to the user to mount read-only until Haiku is more mature.
         BString string;
-        string << "Mounting volume ";
-        if (partition->ContentName() != NULL)
-            string << "'" << partition->ContentName() << "'\n\n";
+        if (partition->ContentName() != NULL) {
+            char str1[127], str2[127];
+            int len = 0;
+            len = sprintf(str1, "%s", B_TRANSLATE("Mounting volume '%s'\n\n"));
+            str1[len] = '\0';
+            len = sprintf(str2, str1, partition->ContentName());
+            str2[len] = '\0';
+            string << str2;
+        }
         else
-            string << "<unnamed volume>\n\n";
+            string << B_TRANSLATE("Mounting volume <unnamed volume>\n\n");
+
         // TODO: Use distro name instead of "Haiku"...
         if (!isBFS) {
-            string << "The file system on this volume is not the Haiku file "
-                "system. It is strongly suggested to mount it in read-only "
-                "mode. ";
+            string << B_TRANSLATE("The file system on this volume is not the "
+                "Haiku file system. It is strongly suggested to mount it in "
+                "read-only mode. This will prevent unintentional data loss "
+                "because of errors in Haiku.");
         } else {
-            string << "It is suggested to mount all additional Haiku volumes "
-                "in read-only mode. ";
+            string << B_TRANSLATE("It is suggested to mount all additional "
+                "Haiku volumes in read-only mode. This will prevent "
+                "unintentional data loss because of errors in Haiku.");
         }
-        string << "This will prevent unintentional data loss because of "
-            "errors in Haiku.";
-        BAlert* alert = new BAlert("Mount warning", string.String(),
-            "Mount read/write", "Cancel", "Mount read-only",
+
+        BAlert* alert = new BAlert(B_TRANSLATE("Mount warning"), 
+            string.String(), B_TRANSLATE("Mount read/write"), 
+            B_TRANSLATE("Cancel"), B_TRANSLATE("Mount read-only"),
             B_WIDTH_FROM_WIDEST, B_WARNING_ALERT);
         alert->SetShortcut(1, B_ESCAPE);
         int32 choice = alert->Go();
@@ -547 +561 @@
     status_t status = partition->Mount(NULL, mountFlags);
     if (status < B_OK) {
         BString string;
-        string << "Error mounting volume. (" << strerror(status) << ")";
-            (new BAlert("", string.String(), "OK"))->Go(NULL);
+        string << B_TRANSLATE("Error mounting volume.");
+        string << " (" << strerror(status)  << ")";
+        (new BAlert("", string.String(), B_TRANSLATE("OK")))->Go(NULL);
     }
 }
 
@@ -557 +572 @@
 AutoMounter::_SuggestForceUnmount(const char* name, status_t error)
 {
     BString text;
-    text << "Could not unmount disk \"" << name << "\":\n\t";
+    text << B_TRANSLATE("Could not unmount disk");
+    text << " \"" << name << "\":\n\t";
     text << strerror(error);
-    text << "\n\nShould unmounting be forced?\n\n"
+    text << "\n\n";
+    text << B_TRANSLATE("Should unmounting be forced?\n\n"
         "Note: If an application is currently writing to the volume, "
-        "unmounting it now might result in loss of data.\n";
+        "unmounting it now might result in loss of data.\n");
 
-    BAlert* alert = new BAlert("", text.String(), "Cancel", "Force unmount",
-        NULL, B_WIDTH_AS_USUAL, B_WARNING_ALERT);
+    BAlert* alert = new BAlert("", text.String(), B_TRANSLATE("Cancel"), 
+        B_TRANSLATE("Force unmount"), NULL, B_WIDTH_AS_USUAL, B_WARNING_ALERT);
     alert->SetShortcut(0, B_ESCAPE);
     int32 choice = alert->Go();
 
@@ -576 +593 @@
 AutoMounter::_ReportUnmountError(const char* name, status_t error)
 {
     BString text;
-    text << "Could not unmount disk \"" << name << "\":\n\t";
+    text << B_TRANSLATE("Could not unmount disk");
+    text << " \"" << name << "\":\n\t";
     text << strerror(error);
 
-    (new BAlert("", text.String(), "OK", NULL, NULL, B_WIDTH_AS_USUAL,
-        B_WARNING_ALERT))->Go(NULL);
+    (new BAlert("", text.String(), B_TRANSLATE("OK"), NULL, NULL, 
+        B_WIDTH_AS_USUAL, B_WARNING_ALERT))->Go(NULL);
 }
 
 
@@ -903 +921 @@
 int
 main(int argc, char* argv[])
 {
+    BCatalog fAppCatalog;
     AutoMounter app;
+    
+    be_locale->GetAppCatalog(&fAppCatalog);
+    
     app.Run();
     return 0;
 }

src/servers/mount/Jamfile

@@ -1 +1 @@
 SubDir HAIKU_TOP src servers mount ;
 
+SubDirHdrs HAIKU_TOP headers os locale ;
+
 UsePrivateHeaders mount shared storage ;
 
 Server mount_server
@@ -7 +9 @@
     AutoMounter.cpp
 #   AutoMounterSettings.cpp
     :
-    libbe.so
+    libbe.so liblocale.so
     $(TARGET_LIBSTDC++)
     :
     mount_server.rdef
 ;
+
+DoCatalogs mount_server :
+    x-vnd.Haiku-mount_server
+    :
+    AutoMounter.cpp
+    : en.catkeys
+;