Ticket #6092: NetworkStatusLocalization.patch

src/apps/networkstatus/NetworkStatusWindow.cpp

@@ -11 +11 @@
 #include "NetworkStatusView.h"
 
 #include <Application.h>
+#include <Catalog.h>
+#include <Locale.h>
 
+#undef B_TRANSLATE_CONTEXT
+#define B_TRANSLATE_CONTEXT "NetworkStatusWindow"
 
+
 NetworkStatusWindow::NetworkStatusWindow()
-    : BWindow(BRect(150, 150, 249, 249), "NetworkStatus", B_TITLED_WINDOW,
-        B_NOT_ZOOMABLE | B_ASYNCHRONOUS_CONTROLS)
+    : BWindow(BRect(150, 150, 249, 249), B_TRANSLATE("NetworkStatus"), 
+        B_TITLED_WINDOW, B_NOT_ZOOMABLE | B_ASYNCHRONOUS_CONTROLS)
 {
     BView* topView = new BView(Bounds(), NULL, B_FOLLOW_ALL, B_WILL_DRAW);
     topView->SetViewColor(ui_color(B_PANEL_BACKGROUND_COLOR));

src/apps/networkstatus/Jamfile

@@ -14 +14 @@
     NetworkStatusWindow.cpp
     NetworkStatusView.cpp
     NetworkStatus.cpp
-    : be $(icon_libs) $(TARGET_NETWORK_LIBS) $(TARGET_LIBSUPC++)
+    : be locale $(icon_libs) $(TARGET_NETWORK_LIBS) $(TARGET_LIBSUPC++)
     : NetworkStatus.rdef NetworkStatusIcons.rdef
     ;
+
+DoCatalogs NetworkStatus :
+    x-vnd.Haiku-NetworkStatus
+    :
+    NetworkStatus.cpp
+    NetworkStatusWindow.cpp
+    NetworkStatusView
+;

src/apps/networkstatus/NetworkStatusView.cpp

@@ -22 +22 @@
 
 #include <Alert.h>
 #include <Application.h>
+#include <Catalog.h>
 #include <Bitmap.h>
 #include <Deskbar.h>
 #include <Dragger.h>
 #include <Drivers.h>
 #include <IconUtils.h>
+#include <Locale.h>
 #include <MenuItem.h>
 #include <MessageRunner.h>
 #include <PopUpMenu.h>
@@ -41 +43 @@
 #include "NetworkStatusIcons.h"
 
 
+#undef B_TRANSLATE_CONTEXT
+#define B_TRANSLATE_CONTEXT "NetworkStatusView"
+
+
 static const char *kStatusDescriptions[] = {
-    "Unknown",
-    "No link",
-    "No stateful configuration",
-    "Configuring",
-    "Ready"
+    B_TRANSLATE_MARK("Unknown"),
+    B_TRANSLATE_MARK("No link"),
+    B_TRANSLATE_MARK("No stateful configuration"),
+    B_TRANSLATE_MARK("Configuring"),
+    B_TRANSLATE_MARK("Ready")
 };
 
 extern "C" _EXPORT BView *instantiate_deskbar_item(void);
@@ -314 +320 @@
     if (!_PrepareRequest(request, name))
         return;
 
-    BString text = name;
-    text += " information:\n";
+    BString text = NULL;
+    if (strncmp("Address", name, strlen(name)) == 0)
+        text = B_TRANSLATE("Address information:\n");
+
+    if (strncmp("Broadcast", name, strlen(name)) == 0)
+        text = B_TRANSLATE("Broadcast information:\n");
+        
+    if (strncmp("Netmask", name, strlen(name)) == 0)
+        text = B_TRANSLATE("Netmask information:\n");
+
     size_t boldLength = text.Length();
 
     for (int i = 0; kInformationEntries[i].label; i++) {
@@ -341 +355 @@
         }
 
         text += "\n";
-        text += kInformationEntries[i].label;
+        
+        if (strncmp("Address", kInformationEntries[i].label, 
+            strlen(kInformationEntries[i].label)) == 0)
+            text += B_TRANSLATE("Address");
+
+        if (strncmp("Broadcast", kInformationEntries[i].label, 
+            strlen(kInformationEntries[i].label)) == 0)
+            text += B_TRANSLATE("Broadcast");
+        
+        if (strncmp("Netmask", kInformationEntries[i].label, 
+            strlen(kInformationEntries[i].label)) == 0)
+            text += B_TRANSLATE("Netmask");
+
         text += ": ";
         text += address;
     }
 
-    BAlert* alert = new BAlert(name, text.String(), "OK");
+    BAlert* alert = new BAlert(name, text.String(), B_TRANSLATE("OK"));
     BTextView* view = alert->TextView();
     BFont font;
 
@@ -380 +406 @@
     }
 
     menu->AddSeparatorItem();
-    //menu->AddItem(new BMenuItem("About NetworkStatus" B_UTF8_ELLIPSIS,
-    //  new BMessage(B_ABOUT_REQUESTED)));
-    menu->AddItem(new BMenuItem("Open network preferences" B_UTF8_ELLIPSIS,
+    //menu->AddItem(new BMenuItem(B_TRANSLATE(
+    // "About NetworkStatus" B_UTF8_ELLIPSIS),
+    // new BMessage(B_ABOUT_REQUESTED)));
+    menu->AddItem(new BMenuItem(B_TRANSLATE(
+        "Open network preferences" B_UTF8_ELLIPSIS),
         new BMessage(kMsgOpenNetworkPreferences)));
 
     if (fInDeskbar)
-        menu->AddItem(new BMenuItem("Quit", new BMessage(B_QUIT_REQUESTED)));
+        menu->AddItem(new BMenuItem(B_TRANSLATE("Quit"), 
+            new BMessage(B_QUIT_REQUESTED)));
     menu->SetTargetForItems(this);
 
     ConvertToScreen(&point);
@@ -397 +426 @@
 void
 NetworkStatusView::_AboutRequested()
 {
-    BAlert* alert = new BAlert("about", "NetworkStatus\n"
-        "\twritten by Axel Dörfler and Hugo Santos\n"
-        "\tCopyright 2007, Haiku, Inc.\n", "OK");
+    BString _about = B_TRANSLATE(
+        "NetworkStatus\n\twritten by %1 and Hugo Santos\n\t%2, Haiku, Inc.\n"
+        );
+    _about.ReplaceFirst("%1", "Axel Dörfler");
+        // Append a new developer here
+    _about.ReplaceFirst("%2", "Copyright 2007-2010");
+        // Append a new year here
+    BAlert* alert = new BAlert("about", _about, B_TRANSLATE("OK"));
     BTextView *view = alert->TextView();
     BFont font;
 
@@ -512 +546 @@
 {
     status_t status = be_roster->Launch("application/x-vnd.Haiku-Network");
     if (status != B_OK && status != B_ALREADY_RUNNING) {
-        BString errorMessage("Launching the network preflet failed.\n\n"
-            "Error: ");
+        BString errorMessage(B_TRANSLATE("Launching the network preflet "
+            "failed.\n\nError: "));
         errorMessage << strerror(status);
         BAlert* alert = new BAlert("launch error", errorMessage.String(),
-            "OK");
+            B_TRANSLATE("OK"));
 
         // asynchronous alert in order to not block replicant host application
         alert->Go(NULL);

src/apps/networkstatus/NetworkStatus.cpp

@@ -13 +13 @@
 
 #include <Alert.h>
 #include <Application.h>
+#include <Catalog.h>
 #include <Deskbar.h>
 #include <Entry.h>
+#include <Locale.h>
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
 
+#undef B_TRANSLATE_CONTEXT
+#define B_TRANSLATE_CONTEXT "NetworkStatus"
+
+
 class NetworkStatus : public BApplication {
     public:
         NetworkStatus();
@@ -34 +40 @@
 
                 bool    fAutoInstallInDeskbar;
                 bool    fQuitImmediately;
+        BCatalog        fAppCatalog;
 };
 
 
@@ -64 +71 @@
       fAutoInstallInDeskbar(false),
       fQuitImmediately(false)
 {
+    be_locale->GetAppCatalog(&fAppCatalog);
 }
 
 
@@ -80 +88 @@
 
     if (strcmp(argv[1], "--help") == 0
         || strcmp(argv[1], "-h") == 0) {
-        printf("NetworkStatus options:\n");
-        printf("   --deskbar      automatically add replicant to Deskbar\n");
-        printf("   --help         print this info and exit\n");
+        const char* str = B_TRANSLATE("NetworkStatus options:\n"
+            "\t--deskbar\tautomatically add replicant to Deskbar\n"
+            "\t--help\t\tprint this info and exit\n");
+        printf(str);
         fQuitImmediately = true;
         return;
     }
@@ -144 +153 @@
     }
 
     if (isDeskbarRunning && !isInstalled) {
-        BAlert* alert = new BAlert("", "Do you want NetworkStatus to live in "
-            "the Deskbar?", "Don't", "Install", NULL, B_WIDTH_AS_USUAL,
-            B_WARNING_ALERT);
+        BAlert* alert = new BAlert("", B_TRANSLATE("Do you want NetworkStatus "
+            "to live in the Deskbar?"), B_TRANSLATE("Don't"), 
+            B_TRANSLATE("Install"), NULL, B_WIDTH_AS_USUAL, B_WARNING_ALERT);
         alert->SetShortcut(0, B_ESCAPE);
 
         if (alert->Go() == 1) {