Ticket #5905: installedpackagesLocalization.patch

src/apps/installedpackages/UninstallWindow.cpp

@@ -7 +7 @@
  */
 #include "UninstallWindow.h"
 
+#include <Catalog.h>
 #include <GroupLayout.h>
+#include <Locale.h>
 
 
-// Macro reserved for later localization
-#define T(x) x
+#undef TR_CONTEXT
+#define TR_CONTEXT "UninstallWindow"
 
-
 UninstallWindow::UninstallWindow()
-    : BWindow(BRect(100, 100, 600, 300), T("Installed packages"),
+    : BWindow(BRect(100, 100, 600, 300), TR("Installed packages"),
         B_TITLED_WINDOW, B_NOT_ZOOMABLE
         | B_QUIT_ON_WINDOW_CLOSE | B_AUTO_UPDATE_SIZE_LIMITS)
 {

src/apps/installedpackages/UninstallView.cpp

@@ -13 +13 @@
 #include <Alert.h>
 #include <Box.h>
 #include <Button.h>
+#include <Catalog.h>
 #include <Directory.h>
 #include <Entry.h>
 #include <File.h>
 #include <FindDirectory.h>
+#include <Locale.h>
 #include <NodeMonitor.h>
 #include <String.h>
 #include <StringView.h>
@@ -27 +29 @@
 #   include <SpaceLayoutItem.h>
 #endif
 
+#undef TR_CONTEXT
+#define TR_CONTEXT "UninstallView"
 
 enum {
     P_MSG_REMOVE = 'umrm',
@@ -34 +38 @@
 };
 
 
-// Reserved
-#define T(x) x
-
-
 // TODO list:
 //  - B_ENTRY_MOVED
 //  - Right now the installed package info naming convention is the same
@@ -45 +45 @@
 //  - Add a status window (reuse the one from PackageInstall)
 
 
-static const char* kNoPackageSelected = "No package selected.";
+static const char* kNoPackageSelected = TR("No package selected.");
 
 class UninstallView::InfoItem : public BStringItem {
     public:
@@ -152 +152 @@
                 if (fWatcherRunning) {
                     _AddFile(filename.String(), ref);
                 } else {
-                    // This most likely means we were waiting for the packages/ dir
-                    // to appear
+                    // This most likely means we were waiting for 
+                    // the packages/ dir to appear
                     if (filename == "packages") {
                         if (watch_node(&ref, B_WATCH_DIRECTORY, this) == B_OK)
                             fWatcherRunning = true;
@@ -171 +171 @@
                     iter = static_cast<InfoItem *>(fAppList->ItemAt(i));
                     if (iter->GetNodeRef() == ref) {
                         if (i == fAppList->CurrentSelection())
-                            fDescription->SetText(T(kNoPackageSelected));
+                            fDescription->SetText(kNoPackageSelected);
                         fAppList->RemoveItem(i);
                         delete iter;
                     }
@@ -199 +199 @@
         case P_MSG_SELECT:
         {
             fButton->SetEnabled(false);
-            fDescription->SetText(T(kNoPackageSelected));
+            fDescription->SetText(kNoPackageSelected);
 
             int32 index = fAppList->CurrentSelection();
             if (index < 0)
@@ -236 +236 @@
                 BListItem* item = fAppList->RemoveItem(index);
                 delete item;
 
-                fDescription->SetText(T(kNoPackageSelected));
+                fDescription->SetText(kNoPackageSelected);
 
                 notify = new BAlert("removal_success",
-                    T("The package you selected has been successfully removed "
-                    "from your system."), T("OK"));
+                    TR("The package you selected has been successfully removed "
+                    "from your system."), TR("OK"));
             } else {
                 notify = new BAlert("removal_failed",
-                    T("The selected package was not removed from your system. "
+                    TR("The selected package was not removed from your system. "
                     "The given installed package information file might have "
-                    "been corrupted."), T("OK"), NULL, 
+                    "been corrupted."), TR("OK"), NULL, 
                     NULL, B_WIDTH_AS_USUAL, B_WARNING_ALERT);
             }
 
@@ -280 +280 @@
     scrollView->SetLayout(scrollLayout);
 
     BStringView* descriptionLabel = new BStringView("desc_label",
-        T("Package description"));
+        TR("Package description"));
     descriptionLabel->SetFont(be_bold_font);
 
     fDescription = new BTextView("description", B_WILL_DRAW);
     fDescription->MakeSelectable(false);
     fDescription->MakeEditable(false);
     fDescription->SetViewColor(ui_color(B_PANEL_BACKGROUND_COLOR));
-    fDescription->SetText(T(kNoPackageSelected));
+    fDescription->SetText(kNoPackageSelected);
 
-    fButton = new BButton("removal", T("Remove"), new BMessage(P_MSG_REMOVE));
+    fButton = new BButton("removal", TR("Remove"), new BMessage(P_MSG_REMOVE));
     fButton->SetEnabled(false);
 
     SetLayout(new BGroupLayout(B_HORIZONTAL));
@@ -333 +333 @@
     BBox* box = new BBox(rect, "desc_box");
 
     BStringView *descLabel = new BStringView(BRect(3, 3, 10, 10), "desc_label",
-        T("Package description:"));
+        TR("Package description:"));
     descLabel->ResizeToPreferred();
     box->AddChild(descLabel);
 
@@ -346 +346 @@
     fDescription->MakeSelectable(true);
     fDescription->MakeEditable(false);
     fDescription->SetViewColor(ui_color(B_PANEL_BACKGROUND_COLOR));
-    fDescription->SetText(T(kNoPackageSelected));
+    fDescription->SetText(kNoPackageSelected);
     
     fDescScroll = new BScrollView("desc_scroll", fDescription, B_FOLLOW_NONE,
         0, false, true, B_NO_BORDER);
@@ -354 +354 @@
 
     AddChild(box);
 
-    fButton = new BButton(BRect(0, 0, 1, 1), "removal", T("Remove"),
+    fButton = new BButton(BRect(0, 0, 1, 1), "removal", TR("Remove"),
         new BMessage(P_MSG_REMOVE));
     fButton->ResizeToPreferred();
     fButton->SetEnabled(false);

src/apps/installedpackages/main.cpp

@@ -6 +6 @@
  *      Łukasz 'Sil2100' Zemczak <sil2100@vexillium.org>
  */
 #include "UninstallWindow.h"
+
+#include <Alert.h>
 #include <Application.h>
+#include <Autolock.h>
+#include <Catalog.h>
+#include <Entry.h>
+#include <Locale.h>
 #include <List.h>
-#include <Alert.h>
 #include <TextView.h>
-#include <Entry.h>
-#include <Autolock.h>
+
 #include <stdio.h>
 
+#undef TR_CONTEXT
+#define TR_CONTEXT "UninstallApplication"
 
 class UninstallApplication : public BApplication {
     public:
@@ -25 +31 @@
         void AboutRequested();
 
     private:
-        UninstallWindow *fWindow;
+        UninstallWindow *fWindow;
+        BCatalog        fAppCatalog;
 };
 
 
 UninstallApplication::UninstallApplication()
-    :   BApplication("application/x-vnd.Haiku-InstalledPackages")
+    :   BApplication("application/x-vnd.Haiku-InstalledPackages"),
+    fWindow(NULL),
+    fAppCatalog(NULL)
 {
+    be_locale->GetAppCatalog(&fAppCatalog);
     fWindow = new UninstallWindow();
     fWindow->Show();
 }
@@ -56 +66 @@
 UninstallApplication::AboutRequested()
 {
     BAlert *about = new BAlert("about",
-            "InstalledPackages\n"
+            TR("InstalledPackages\n"
             "BeOS legacy .pkg package removing application for Haiku.\n\n"
             "Copyright 2007,\nŁukasz 'Sil2100' Zemczak\n\n"
-            "Copyright (c) 2007 Haiku, Inc. \n",
-            "Close");
+            "Copyright (c) 2007 Haiku, Inc. \n"),
+            TR("Close"));
 
     BTextView *view = about->TextView();
     BFont font;

src/apps/installedpackages/Jamfile

@@ -13 +13 @@
     main.cpp
     UninstallWindow.cpp
     UninstallView.cpp
-    : be tracker $(TARGET_LIBSUPC++)
+    : be locale tracker translation z $(TARGET_LIBSUPC++)
 ;