Ticket #7149: wonderbrushtranslator-localization.patch

src/add-ons/translators/wonderbrush/Jamfile

@@ -21 +21 @@
     blending.cpp
     lab_convert.cpp
 
-    : be translation z libtranslatorsutils.a $(TARGET_LIBSUPC++)
+    : be translation z libtranslatorsutils.a $(TARGET_LIBSUPC++) $(HAIKU_LOCALE_LIBS)
     $(HAIKU_LOCALE_LIBS)
     : true
 ;
 
+DoCatalogs WonderBrushTranslator :
+    x-vnd.Haiku-WonderBrushTranslator
+    :
+    Layer.cpp
+    WonderBrushMain.cpp
+    WonderBrushTranslator.cpp
+    WonderBrushView.cpp
+;
+
 Package haiku-translationkit-cvs :
     WonderBrushTranslator :
     boot home config add-ons Translators ;

src/add-ons/translators/wonderbrush/WonderBrushMain.cpp

@@ -7 +7 @@
  */
 
 #include <Application.h>
+#include <Catalog.h>
 
 #include "WonderBrushTranslator.h"
 #include "TranslatorWindow.h"
 
+#undef B_TRANSLATE_CONTEXT
+#define B_TRANSLATE_CONTEXT "WonderBrushMain"
+
 int
 main()
 {
     BApplication app("application/x-vnd.Haiku-WonderBrushTranslator");
     status_t result;
     result = LaunchTranslatorWindow(new WonderBrushTranslator,
-        "WBI Settings", BRect(0, 0, 225, 175));
+        B_TRANSLATE("WBI Settings"), BRect(0, 0, 225, 175));
     if (result == B_OK) {
         app.Run();
         return 0;

src/add-ons/translators/wonderbrush/Layer.cpp

@@ -11 +11 @@
 
 #include <stdio.h>
 
+#include <Catalog.h>
 #include <Bitmap.h>
 #include <Message.h>
 
@@ -19 +20 @@
 #include "lab_convert.h"
 #include "support.h"
 
+#undef B_TRANSLATE_CONTEXT
+#define B_TRANSLATE_CONTEXT "Layer"
 
 // constructor
 Layer::Layer()
@@ -422 +425 @@
     delete fBitmap;
     fBitmap = NULL;
 
-    status_t status = extract_bitmap(&fBitmap, archive, "current bitmap");
+    status_t status = extract_bitmap(&fBitmap, archive, 
+        B_TRANSLATE("current bitmap"));
     if (status < B_OK)
         return status;
 

src/add-ons/translators/wonderbrush/WonderBrushTranslator.cpp

@@ -12 +12 @@
 #include <stdio.h>
 #include <string.h>
 
+#include <Catalog.h>
 #include <Bitmap.h>
 #include <OS.h>
 
@@ -20 +21 @@
 #include "WonderBrushImage.h"
 #include "WonderBrushView.h"
 
+#undef B_TRANSLATE_CONTEXT
+#define B_TRANSLATE_CONTEXT "WonderBrushTranslator"
+
 using std::nothrow;
 
 // The input formats that this translator supports.
@@ -69 +73 @@
     { B_TRANSLATOR_EXT_DATA_ONLY, TRAN_SETTING_BOOL, false }
 };
 
-const uint32 kNumInputFormats = sizeof(sInputFormats) / sizeof(translation_format);
-const uint32 kNumOutputFormats = sizeof(sOutputFormats) / sizeof(translation_format);
-const uint32 kNumDefaultSettings = sizeof(sDefaultSettings) / sizeof(TranSetting);
+const uint32 kNumInputFormats = sizeof(sInputFormats) / 
+    sizeof(translation_format);
+const uint32 kNumOutputFormats = sizeof(sOutputFormats) / 
+    sizeof(translation_format);
+const uint32 kNumDefaultSettings = sizeof(sDefaultSettings) / 
+    sizeof(TranSetting);
 
 
 BTranslator*
@@ -85 +92 @@
 
 
 WonderBrushTranslator::WonderBrushTranslator()
-    : BaseTranslator("WonderBrush images", "WonderBrush image translator",
+    : BaseTranslator(B_TRANSLATE("WonderBrush images"), 
+        B_TRANSLATE("WonderBrush image translator"),
         WBI_TRANSLATOR_VERSION,
         sInputFormats, kNumInputFormats,
         sOutputFormats, kNumOutputFormats,
@@ -124 +132 @@
             outInfo->quality = WBI_IN_QUALITY;
             outInfo->capability = WBI_IN_CAPABILITY;
             strcpy(outInfo->MIME, "image/x-wonderbrush");
-            strcpy(outInfo->name, "WonderBrush image");
+            strcpy(outInfo->name, B_TRANSLATE("WonderBrush image"));
         }
     } else {
         delete wbImage;
@@ -170 +178 @@
 BView*
 WonderBrushTranslator::NewConfigView(TranslatorSettings* settings)
 {
-    return new WonderBrushView(BRect(0, 0, 225, 175), "WBI Settings",
-        B_FOLLOW_ALL, B_WILL_DRAW, settings);
+    return new WonderBrushView(BRect(0, 0, 225, 175), 
+        B_TRANSLATE("WBI Settings"), B_FOLLOW_ALL, B_WILL_DRAW, settings);
 }
 
 

src/add-ons/translators/wonderbrush/WonderBrushView.cpp

@@ -11 +11 @@
 #include <stdio.h>
 #include <string.h>
 
+#include <Catalog.h>
 #include <MenuBar.h>
 #include <MenuField.h>
 #include <MenuItem.h>
@@ -20 +21 @@
 #include "WonderBrushImage.h"
 #include "WonderBrushTranslator.h"
 
+#undef B_TRANSLATE_CONTEXT
+#define B_TRANSLATE_CONTEXT "WonderBrushView"
+
 const char* kAuthor = "Stephan Aßmus, <superstippi@gmx.de>";
 const char* kWBICopyright = "Copyright "B_UTF8_COPYRIGHT" 2006 Haiku Inc.";
 
@@ -129 +133 @@
 
     BPoint offset(xbold, ybold);
 
-    const char* text = "WonderBrush image translator";
+    const char* text = B_TRANSLATE("WonderBrush image translator");
     DrawString(text, offset);
 
     SetFont(be_plain_font);
@@ -140 +144 @@
     offset.y += yplain;
 
     char detail[100];
-    sprintf(detail, "Version %d.%d.%d %s",
+    sprintf(detail, B_TRANSLATE("Version %d.%d.%d %s"),
         static_cast<int>(B_TRANSLATION_MAJOR_VERSION(WBI_TRANSLATOR_VERSION)),
         static_cast<int>(B_TRANSLATION_MINOR_VERSION(WBI_TRANSLATOR_VERSION)),
-        static_cast<int>(B_TRANSLATION_REVISION_VERSION(WBI_TRANSLATOR_VERSION)),
-        __DATE__);
+        static_cast<int>(B_TRANSLATION_REVISION_VERSION(
+            WBI_TRANSLATOR_VERSION)), __DATE__);
     DrawString(detail, offset);
 
     offset.y += 2 * ybold;
 
-    text = "written by:";
+    text = B_TRANSLATE("written by:");
     DrawString(text, offset);
     offset.y += ybold;