Ticket #7169: diskusage-localization.patch

src/apps/diskusage/MainWindow.cpp

@@ -10 +10 @@
 #include "MainWindow.h"
 
 #include <Application.h>
+#include <Catalog.h>
 #include <Node.h>
 #include <Roster.h>
 #include <Screen.h>
@@ -19 +20 @@
 #include "Common.h"
 #include "ControlsView.h"
 
+#undef B_TRANSLATE_CONTEXT
+#define B_TRANSLATE_CONTEXT "MainWindow"
 
 MainWindow::MainWindow(BRect pieRect)
     :
-    BWindow(pieRect, "DiskUsage", B_TITLED_WINDOW,
+    BWindow(pieRect, B_TRANSLATE("DiskUsage"), B_TITLED_WINDOW,
         B_ASYNCHRONOUS_CONTROLS | B_QUIT_ON_WINDOW_CLOSE
         | B_AUTO_UPDATE_SIZE_LIMITS)
 {

src/apps/diskusage/Jamfile

@@ -15 +15 @@
     Snapshot.cpp
     StatusView.cpp
     VolumeView.cpp
-    : be $(TARGET_LIBSTDC++)
+    : be $(HAIKU_LOCALE_LIBS) $(TARGET_LIBSTDC++)
     : DiskUsage.rdef
 ;
 
+DoCatalogs DiskUsage :
+    x-vnd.Haiku-DiskUsage
+    :
+    MainWindow.cpp
+    Common.cpp
+;
+

src/apps/diskusage/Common.cpp

@@ -17 +17 @@
 #include <stdlib.h>
 
 #include <Application.h>
+#include <Catalog.h>
 #include <FindDirectory.h>
 #include <Roster.h>
 #include <Path.h>
 
 
+#undef B_TRANSLATE_CONTEXT
+#define B_TRANSLATE_CONTEXT "Common"
+
 const char* kAppSignature       = "application/x-vnd.Haiku-DiskUsage";
 const char* kHelpFileName       = "userguide/en/applications/diskusage.html";
 const char* kPieRectAttrName    = "mainrect";
@@ -76 +80 @@
 
     size_t ignore;
     kVolMenuLabel = LoadString("STR_VM_LABEL");
+    if (strncmp(kVolMenuLabel, "Volume:", sizeof("Volume:")) == 0)
+        kVolMenuLabel = (char *)B_TRANSLATE("Volume:");
+
     kOneFile = LoadString("STR_1_FILE");
+    if (strncmp(kOneFile, "%d file", sizeof("%d file")) == 0)
+        kOneFile = (char *)B_TRANSLATE("%d file");
+
     kManyFiles = LoadString("STR_N_FILES");
+    if (strncmp(kManyFiles, "%d files", sizeof("%d files")) == 0)
+        kManyFiles = (char *)B_TRANSLATE("%d files");
+
     kStrScan = LoadString("STR_SCAN");
+    if (strncmp(kStrScan, "Scan", sizeof("Scan")) == 0)
+        kStrScan = (char *)B_TRANSLATE("Scan");
+        
     kStrRescan = LoadString("STR_RESCAN");
+    if (strncmp(kStrRescan, "Rescan", sizeof("Rescan")) == 0)
+        kStrRescan = (char *)B_TRANSLATE("Rescan");
+
     kStrScanningX = LoadString("STR_SCN_X");
+    if (strncmp(kStrScanningX, "Scanning ", sizeof("Scanning ")) == 0) {
+        BString sScan(B_TRANSLATE("Scanning"));
+        sScan << " ";
+        kStrScanningX = (char *)sScan.String();
+    }
+
     kStrUnavail = LoadString("STR_UNAVAIL");
+    if (strncmp(kStrUnavail, "file unavailable", sizeof("file unavailable")) 
+        == 0)
+        kStrUnavail = (char *)B_TRANSLATE("file unavailable");
+
     kVolMenuDefault = LoadString("STR_VM_DFLT");
+    if (strncmp(kVolMenuDefault, "(Select)", sizeof("(Select)")) == 0)
+        kVolMenuDefault = (char *)B_TRANSLATE("(Select)");
+        
     kVolPrompt = LoadString("STR_VPROMPT");
+    if (strncmp(kVolPrompt, "Select a volume to scan",
+        sizeof("Select a volume to scan")) == 0)
+        kVolPrompt = (char *)B_TRANSLATE("Select a volume to scan");
+
     kMenuGetInfo = LoadString("STR_M_INFO");
+    if (strncmp(kMenuGetInfo, "Get Info", sizeof("Get Info")) == 0)
+        kMenuGetInfo = (char *)B_TRANSLATE("Get Info");
+
     kMenuOpen = LoadString("STR_M_OPEN");
+    if (strncmp(kMenuOpen, "Open", sizeof("Open")) == 0)
+        kMenuOpen = (char *)B_TRANSLATE("Open");
+
     kMenuOpenWith = LoadString("STR_M_OPENW");
+    if (strncmp(kMenuOpenWith, "Open With", sizeof("Open With")) == 0)
+        kMenuOpenWith = (char *)B_TRANSLATE("Open With");
+
     kMenuNoApps = LoadString("STR_M_NAPPS");
+    if (strncmp(kMenuNoApps, "no supporting apps",
+        sizeof("no supporting apps")) == 0)
+        kMenuNoApps = (char *)B_TRANSLATE("no supporting apps");
+
     kInfoSize = LoadString("STR_SIZE");
+    if (strncmp(kInfoSize, "Size", sizeof("Size")) == 0)
+        kInfoSize = (char *)B_TRANSLATE("Size");
+
     kInfoInFiles = LoadString("STR_INFILES");
+    if (strncmp(kInfoInFiles, " in %d files", sizeof(" in %d files")) == 0)
+        kInfoInFiles = (char *)B_TRANSLATE(" in %d files");
+
     kInfoCreated = LoadString("STR_MADE");
+    if (strncmp(kInfoCreated, "Created", sizeof("Created")) == 0)
+        kInfoCreated = (char *)B_TRANSLATE("Created");
+
     kInfoModified = LoadString("STR_MOD");
+    if (strncmp(kInfoModified, "Modified", sizeof("Modified")) == 0)
+        kInfoModified = (char *)B_TRANSLATE("Modified");
+
     kInfoTimeFmt = LoadString("STR_TIMEFMT");
+    if (strncmp(kInfoTimeFmt, "%a, %d %b %Y, %r",
+        sizeof("%a, %d %b %Y, %r")) == 0)
+        kInfoTimeFmt = (char *)B_TRANSLATE("%a, %d %b %Y, %r");
+
     kInfoKind = LoadString("STR_KIND");
+    if (strncmp(kInfoKind, "Kind", sizeof("Kind")) == 0)
+        kInfoKind = (char *)B_TRANSLATE("Kind");
+
     kInfoPath = LoadString("STR_PATH");
+    if (strncmp(kInfoPath, "Path", sizeof("Path")) == 0)
+        kInfoPath = (char *)B_TRANSLATE("Path");
+
     kOutdatedStr = LoadString("STR_OUTDATED");
+    if (strncmp(kOutdatedStr, "Outdated view", sizeof("Outdated view")) == 0)
+        kOutdatedStr = (char *)B_TRANSLATE("Outdated view");
 
     kWindowColor = ui_color(B_PANEL_BACKGROUND_COLOR);
     kOutlineColor = LoadColor("RGB_PIE_OL");