Ticket #7131: pngtranslator-localization.patch

src/add-ons/translators/png/PNGTranslator.cpp

@@ -35 +35 @@
 #include <OS.h>
 #define PNG_NO_PEDANTIC_WARNINGS
 #include <png.h>
+#include <Catalog.h>
 #include "PNGTranslator.h"
 #include "PNGView.h"
 
+#undef B_TRANSLATE_CONTEXT
+#define B_TRANSLATE_CONTEXT "PNGTranslator"
+
 // The input formats that this translator supports.
 static const translation_format sInputFormats[] = {
     {
@@ -185 +189 @@
 // Returns:
 // ---------------------------------------------------------------
 PNGTranslator::PNGTranslator()
-    : BaseTranslator("PNG images", "PNG image translator",
+    : BaseTranslator(B_TRANSLATE("PNG images"), 
+        B_TRANSLATE("PNG image translator"),
         PNG_TRANSLATOR_VERSION,
         sInputFormats, kNumInputFormats,
         sOutputFormats, kNumOutputFormats,
@@ -229 +234 @@
         outInfo->quality = PNG_IN_QUALITY;
         outInfo->capability = PNG_IN_CAPABILITY;
         strcpy(outInfo->MIME, "image/png");
-        strcpy(outInfo->name, "PNG image");
+        strcpy(outInfo->name, B_TRANSLATE("PNG image"));
     }
 
     return B_OK;
@@ -975 +980 @@
 PNGTranslator::NewConfigView(TranslatorSettings *settings)
 {
     return new PNGView(BRect(0, 0, PNG_VIEW_WIDTH, PNG_VIEW_HEIGHT),
-        "PNGTranslator Settings", B_FOLLOW_ALL, B_WILL_DRAW, settings);
+        B_TRANSLATE("PNGTranslator Settings"), B_FOLLOW_ALL, 
+        B_WILL_DRAW, settings);
 }
 

src/add-ons/translators/png/PNGView.cpp

@@ -12 +12 @@
 #include "PNGTranslator.h"
 
 #include <Alert.h>
+#include <Catalog.h>
 #include <MenuField.h>
 #include <MenuItem.h>
 #include <PopUpMenu.h>
@@ -22 +23 @@
 #define PNG_NO_PEDANTIC_WARNINGS
 #include <png.h>
 
+#undef B_TRANSLATE_CONTEXT
+#define B_TRANSLATE_CONTEXT "PNGTranslator"
 
 PNGView::PNGView(const BRect &frame, const char *name, uint32 resizeMode,
         uint32 flags, TranslatorSettings *settings)
@@ -35 +38 @@
     float height = fontHeight.descent + fontHeight.ascent + fontHeight.leading;
 
     BRect rect(10, 10, 200, 10 + height);
-    BStringView *stringView = new BStringView(rect, "title", "PNG image translator");
+    BStringView *stringView = new BStringView(rect, "title", 
+        B_TRANSLATE("PNG image translator"));
     stringView->SetFont(be_bold_font);
     stringView->ResizeToPreferred();
     AddChild(stringView);
@@ -44 +48 @@
 
     rect.OffsetBy(0, height + 10);
     char version[256];
-    snprintf(version, sizeof(version), "Version %d.%d.%d, %s",
+    snprintf(version, sizeof(version), B_TRANSLATE("Version %d.%d.%d, %s"),
         int(B_TRANSLATION_MAJOR_VERSION(PNG_TRANSLATOR_VERSION)),
         int(B_TRANSLATION_MINOR_VERSION(PNG_TRANSLATOR_VERSION)),
         int(B_TRANSLATION_REVISION_VERSION(PNG_TRANSLATOR_VERSION)),
@@ -60 +64 @@
     height = fontHeight.descent + fontHeight.ascent + fontHeight.leading;
 
     rect.OffsetBy(0, height + 5);
-    stringView = new BStringView(rect, "Copyright", B_UTF8_COPYRIGHT "2003-2006 Haiku Inc.");
+    stringView = new BStringView(rect, 
+        "Copyright", B_UTF8_COPYRIGHT "2003-2006 Haiku Inc.");
     stringView->ResizeToPreferred();
     AddChild(stringView);
 
     // setup PNG interlace options
 
-    fInterlaceMenu = new BPopUpMenu("Interlace Option");
-    BMenuItem* item = new BMenuItem("None", _InterlaceMessage(PNG_INTERLACE_NONE));
+    fInterlaceMenu = new BPopUpMenu(B_TRANSLATE("Interlace Option"));
+    BMenuItem* item = new BMenuItem(B_TRANSLATE("None"), 
+        _InterlaceMessage(PNG_INTERLACE_NONE));
     if (fSettings->SetGetInt32(PNG_SETTING_INTERLACE) == PNG_INTERLACE_NONE)
         item->SetMarked(true);
     fInterlaceMenu->AddItem(item);
@@ -78 +84 @@
     fInterlaceMenu->AddItem(item);
 
     rect.OffsetBy(0, stringView->Frame().Height() + 20.0f);
-    BMenuField* menuField = new BMenuField(rect, "PNG Interlace Menu",
-        "Interlacing type:", fInterlaceMenu);
+    BMenuField* menuField = new BMenuField(rect, 
+        B_TRANSLATE("PNG Interlace Menu"),
+        B_TRANSLATE("Interlacing type:"), fInterlaceMenu);
     menuField->SetDivider(menuField->StringWidth(menuField->Label()) + 7.0f);
     menuField->ResizeToPreferred();
     AddChild(menuField);
@@ -87 +94 @@
     rect.OffsetBy(0, height + 15);
     rect.right = Bounds().right;
     rect.bottom = Bounds().bottom;
-    fCopyrightView = new BTextView(rect, "PNG copyright", rect.OffsetToCopy(B_ORIGIN),
+    fCopyrightView = new BTextView(rect, "PNG copyright", 
+        rect.OffsetToCopy(B_ORIGIN),
         B_FOLLOW_ALL, B_WILL_DRAW | B_FRAME_EVENTS);
     fCopyrightView->SetViewColor(ui_color(B_PANEL_BACKGROUND_COLOR));
     fCopyrightView->SetLowColor(fCopyrightView->ViewColor());
@@ -101 +109 @@
 
     if (maxWidth + 20 > Bounds().Width())
         ResizeTo(maxWidth + 20, Bounds().Height());
-    if (Bounds().Height() < rect.top + stringView->Bounds().Height() * 3.0f + 8.0f)
+    if (Bounds().Height() < rect.top + stringView->Bounds().Height() 
+        * 3.0f + 8.0f)
         ResizeTo(Bounds().Width(), rect.top + height * 3.0f + 8.0f);
 
     fCopyrightView->SetTextRect(fCopyrightView->Bounds());

src/add-ons/translators/png/Jamfile

@@ -14 +14 @@
     PNGTranslator.cpp
     PNGView.cpp
 
-    : be translation libpng.a z libtranslatorsutils.a $(TARGET_LIBSUPC++)
-    $(HAIKU_LOCALE_LIBS)
+    : be translation libpng.a z libtranslatorsutils.a $(TARGET_LIBSUPC++) $(HAIKU_LOCALE_LIBS)
     : true
 ;
 
+DoCatalogs PNGTranslator :
+    x-vnd.Haiku-PNGTranslator
+    :
+    PNGMain.cpp
+    PNGTranslator.cpp
+    PNGView.cpp
+;
+
 Package haiku-translationkit-cvs :
     PNGTranslator :
     boot home config add-ons Translators ;

src/add-ons/translators/png/PNGMain.cpp

@@ -33 +33 @@
 /*****************************************************************************/
 
 #include <Application.h>
+#include <Catalog.h>
 #include "PNGTranslator.h"
 #include "PNGView.h"
 #include "TranslatorWindow.h"
 
+#undef B_TRANSLATE_CONTEXT
+#define B_TRANSLATE_CONTEXT "PNGTranslator"
+
 // ---------------------------------------------------------------
 // main
 //
@@ -56 +60 @@
     BApplication app("application/x-vnd.Haiku-PNGTranslator");
     status_t result;
     result = LaunchTranslatorWindow(new PNGTranslator,
-        "PNG Settings", BRect(0, 0, PNG_VIEW_WIDTH, PNG_VIEW_HEIGHT));
+        B_TRANSLATE("PNG Settings"), BRect(0, 0, PNG_VIEW_WIDTH, 
+        PNG_VIEW_HEIGHT));
     if (result == B_OK) {
         app.Run();
         return 0;