Ticket #7150: notification_server-localization.patch

src/servers/notification/NotificationWindow.cpp

@@ -18 +18 @@
 
 #include <Alert.h>
 #include <Application.h>
+#include <Catalog.h>
 #include <Debug.h>
 #include <File.h>
 #include <NodeMonitor.h>
@@ -27 +28 @@
 #include "AppUsage.h"
 #include "BorderView.h"
 
+#undef B_TRANSLATE_CONTEXT
+#define B_TRANSLATE_CONTEXT "NotificationWindow"
 
+
 property_info main_prop_list[] = {
-    {"message", {B_GET_PROPERTY, 0}, {B_INDEX_SPECIFIER, 0}, "get a message"},
+    {"message", {B_GET_PROPERTY, 0}, {B_INDEX_SPECIFIER, 0}, 
+        B_TRANSLATE_MARK("get a message")},
     {"message", {B_COUNT_PROPERTIES, 0}, {B_DIRECT_SPECIFIER, 0},
-        "count messages"},
+        B_TRANSLATE_MARK("count messages")},
     {"message", {B_CREATE_PROPERTY, 0}, {B_DIRECT_SPECIFIER, 0},
-        "create a message"},
+        B_TRANSLATE_MARK("create a message")},
     {"message", {B_SET_PROPERTY, 0}, {B_INDEX_SPECIFIER, 0},
-        "modify a message"},
+        B_TRANSLATE_MARK("modify a message")},
     {0}
 };
 
@@ -45 +50 @@
 const float kPenSize                = 1;
 const float kEdgePadding            = 5;
 const float kSmallPadding           = 2;
+static const BString kFilterMonitorStr(B_TRANSLATE_MARK("Couldn't start "
+    "filter monitor. Live filter changes disabled."));
+static const BString kDisplaySettingsStr(B_TRANSLATE_MARK("Couldn't start "
+    "display settings monitor.\nLive filter changes disabled."));
+static const BString kGeneralSettingsStr(B_TRANSLATE_MARK("Couldn't start "
+    "general settings monitor.\nLive filter changes disabled."));
+static const BString kOKStr(B_TRANSLATE_MARK("OK"));
+static const BString kDarnStr(B_TRANSLATE_MARK("Darn."));
 
 
 NotificationWindow::NotificationWindow()
     :
-    BWindow(BRect(10, 10, 30, 30), "Notification", B_BORDERED_WINDOW,
-        B_AVOID_FRONT | B_AVOID_FOCUS | B_NOT_CLOSABLE | B_NOT_ZOOMABLE
-            | B_NOT_MINIMIZABLE | B_NOT_RESIZABLE, B_ALL_WORKSPACES)
+    BWindow(BRect(10, 10, 30, 30), B_TRANSLATE_MARK("Notification"), 
+        B_BORDERED_WINDOW, B_AVOID_FRONT | B_AVOID_FOCUS | B_NOT_CLOSABLE 
+        | B_NOT_ZOOMABLE | B_NOT_MINIMIZABLE | B_NOT_RESIZABLE, 
+        B_ALL_WORKSPACES)
 {
     fBorder = new BorderView(Bounds(), "Notification");
 
@@ -470 +484 @@
         entry.GetNodeRef(&nref);
 
         if (watch_node(&nref, B_WATCH_ALL, BMessenger(this)) != B_OK) {
-            BAlert* alert = new BAlert("", "Couldn't start filter "
-                " monitor. Live filter changes disabled.", "Darn.");
+            BAlert* alert = new BAlert("", kFilterMonitorStr.String(), 
+                kDarnStr.String());
             alert->Go();
         }
     }
@@ -534 +548 @@
         entry.GetNodeRef(&nref);
 
         if (watch_node(&nref, B_WATCH_ALL, BMessenger(this)) != B_OK) {
-            BAlert* alert = new BAlert("", "Couldn't start general settings "
-                " monitor.\nLive filter changes disabled.", "OK");
+            BAlert* alert = new BAlert("", kGeneralSettingsStr.String(), 
+                kOKStr.String());
             alert->Go();
         }
     }
@@ -598 +612 @@
         entry.GetNodeRef(&nref);
 
         if (watch_node(&nref, B_WATCH_ALL, BMessenger(this)) != B_OK) {
-            BAlert* alert = new BAlert("", "Couldn't start display settings "
-                " monitor.\nLive filter changes disabled.", "OK");
+            BAlert* alert = new BAlert("", kDisplaySettingsStr.String(), 
+                kOKStr.String());
             alert->Go();
         }
     }

src/servers/notification/NotificationView.cpp

@@ -14 +14 @@
 
 #include <stdlib.h>
 
+#include <Catalog.h>
 #include <Font.h>
 #include <IconUtils.h>
 #include <Messenger.h>
@@ -28 +29 @@
 #include "NotificationView.h"
 #include "NotificationWindow.h"
 
+#undef B_TRANSLATE_CONTEXT
+#define B_TRANSLATE_CONTEXT "NotificationView"
+
 const char* kSmallIconAttribute = "BEOS:M:STD_ICON";
 const char* kLargeIconAttribute = "BEOS:L:STD_ICON";
 const char* kIconAttribute      = "BEOS:ICON";
 
 property_info message_prop_list[] = {
     { "type", {B_GET_PROPERTY, B_SET_PROPERTY, 0},
-        {B_DIRECT_SPECIFIER, 0}, "get the notification type"},
+        {B_DIRECT_SPECIFIER, 0}, B_TRANSLATE_MARK("get the notification type")},
     { "app", {B_GET_PROPERTY, B_SET_PROPERTY, 0},
-        {B_DIRECT_SPECIFIER, 0}, "get notification's app"},
+        {B_DIRECT_SPECIFIER, 0}, B_TRANSLATE_MARK("get notification's app")},
     { "title", {B_GET_PROPERTY, B_SET_PROPERTY, 0},
-        {B_DIRECT_SPECIFIER, 0}, "get notification's title"},
+        {B_DIRECT_SPECIFIER, 0}, B_TRANSLATE_MARK("get notification's title")},
     { "content", {B_GET_PROPERTY, B_SET_PROPERTY, 0},
-        {B_DIRECT_SPECIFIER, 0}, "get notification's contents"},
+        {B_DIRECT_SPECIFIER, 0}, B_TRANSLATE_MARK("get notification's contents")},
     { "icon", {B_GET_PROPERTY, 0},
-        {B_DIRECT_SPECIFIER, 0}, "get icon as an archived bitmap"},
+        {B_DIRECT_SPECIFIER, 0}, B_TRANSLATE_MARK("get icon as an archived bitmap")},
     { "progress", {B_GET_PROPERTY, B_SET_PROPERTY, 0},
-        {B_DIRECT_SPECIFIER, 0}, "get the progress (between 0.0 and 1.0)"},
+        {B_DIRECT_SPECIFIER, 0}, B_TRANSLATE_MARK("get the progress (between 0.0 and 1.0)")},
     { NULL }
 };
 

src/servers/notification/Jamfile

@@ -13 +13 @@
     : notification_server.rdef
 ;
 
+DoCatalogs notification_server :
+    x-vnd.Haiku-notification_server
+    :
+    NotificationServer.cpp
+    NotificationView.cpp
+    NotificationWindow.cpp
+;
+
 Depends notification_server : libicon.a ;
 Depends notification_server : libnotification.a ;

src/servers/notification/NotificationServer.cpp

@@ -6 +6 @@
  *      Pier Luigi Fiorini, pierluigi.fiorini@gmail.com
  */
 
+#include <Catalog.h>
 #include <Beep.h>
 #include <Notifications.h>
 
 #include "NotificationWindow.h"
 #include "NotificationServer.h"
 
+#undef B_TRANSLATE_CONTEXT
+#define B_TRANSLATE_CONTEXT "NotificationServer"
+
 const char* kSoundNames[] = {
-    "Information notification",
-    "Important notification",
-    "Error notification",
-    "Progress notification",
+    B_TRANSLATE_MARK("Information notification"),
+    B_TRANSLATE_MARK("Important notification"),
+    B_TRANSLATE_MARK("Error notification"),
+    B_TRANSLATE_MARK("Progress notification"),
     NULL
 };