Ticket #7128: icotranslator-localization.patch

src/add-ons/translators/ico/ConfigView.cpp

@@ -7 +7 @@
 #include "ConfigView.h"
 #include "ICOTranslator.h"
 
+#include <Catalog.h>
 #include <CheckBox.h>
 #include <ControlLook.h>
 #include <SpaceLayoutItem.h>
@@ -15 +16 @@
 #include <stdio.h>
 #include <string.h>
 
+#undef B_TRANSLATE_CONTEXT
+#define B_TRANSLATE_CONTEXT "ConfigView"
 
+
 ConfigView::ConfigView()
     :
-    BGroupView("ICOTranslator Settings", B_VERTICAL, 0)
+    BGroupView(B_TRANSLATE("ICOTranslator Settings"), B_VERTICAL, 0)
 {
     BAlignment leftAlignment(B_ALIGN_LEFT, B_ALIGN_VERTICAL_UNSET); 
 
-    BStringView* stringView = new BStringView("title", "Windows icon images");
+    BStringView* stringView = new BStringView("title", 
+        B_TRANSLATE("Windows icon images"));
     stringView->SetFont(be_bold_font);
     stringView->SetExplicitAlignment(leftAlignment);
     AddChild(stringView);
@@ -31 +36 @@
     AddChild(BSpaceLayoutItem::CreateVerticalStrut(spacing));
 
     char version[256];
-    sprintf(version, "Version %d.%d.%d, %s",
+    sprintf(version, B_TRANSLATE("Version %d.%d.%d, %s"),
         int(B_TRANSLATION_MAJOR_VERSION(ICO_TRANSLATOR_VERSION)),
         int(B_TRANSLATION_MINOR_VERSION(ICO_TRANSLATOR_VERSION)),
         int(B_TRANSLATION_REVISION_VERSION(ICO_TRANSLATOR_VERSION)),
@@ -47 +52 @@
 
     AddChild(BSpaceLayoutItem::CreateVerticalStrut(spacing));
 
-    BCheckBox *checkBox = new BCheckBox("color", "Write 32 bit images on"
-        " true color input", NULL);
+    BCheckBox *checkBox = new BCheckBox("color", 
+        B_TRANSLATE("Write 32 bit images on true color input"), NULL);
     checkBox->SetExplicitAlignment(leftAlignment);
     AddChild(checkBox);
 
-    checkBox = new BCheckBox("size", "Enforce valid icon sizes", NULL);
+    checkBox = new BCheckBox("size", B_TRANSLATE("Enforce valid icon sizes"), 
+        NULL);
     checkBox->SetValue(1);
     checkBox->SetExplicitAlignment(leftAlignment);
     AddChild(checkBox);
 
     AddChild(BSpaceLayoutItem::CreateVerticalStrut(spacing));
 
-    stringView = new BStringView("valid1", "Valid icon sizes are"
-        " 16, 32, or 48");
+    stringView = new BStringView("valid1", 
+        B_TRANSLATE("Valid icon sizes are 16, 32, or 48"));
     stringView->SetExplicitAlignment(leftAlignment);
     AddChild(stringView);
 
-    stringView = new BStringView("valid2", "pixel in either direction.");
+    stringView = new BStringView("valid2", 
+        B_TRANSLATE("pixel in either direction."));
     stringView->SetExplicitAlignment(leftAlignment);
     AddChild(stringView);
 

src/add-ons/translators/ico/ICOTranslator.cpp

@@ -8 +8 @@
 #include "ConfigView.h"
 #include "ICO.h"
 
+#include <Catalog.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
 
+#undef B_TRANSLATE_CONTEXT
+#define B_TRANSLATE_CONTEXT "ICOTranslator"
 
+
 const char *kDocumentCount = "/documentCount";
 const char *kDocumentIndex = "/documentIndex";
 
@@ -72 +76 @@
 
 
 ICOTranslator::ICOTranslator()
-    : BaseTranslator("Windows icon images", "Windows icon translator",
+    : BaseTranslator(B_TRANSLATE("Windows icon images"), 
+        B_TRANSLATE("Windows icon translator"),
         ICO_TRANSLATOR_VERSION,
         sInputFormats, kNumInputFormats,
         sOutputFormats, kNumOutputFormats,
@@ -107 +112 @@
     info->group = B_TRANSLATOR_BITMAP;
     info->quality = ICO_IN_QUALITY;
     info->capability = ICO_IN_CAPABILITY;
-    snprintf(info->name, sizeof(info->name), "Windows %s %ld bit image",
-        type == ICO::kTypeIcon ? "Icon" : "Cursor", bitsPerPixel);
+    snprintf(info->name, sizeof(info->name), 
+        B_TRANSLATE("Windows %s %ld bit image"),
+        type == ICO::kTypeIcon ? B_TRANSLATE("Icon") : B_TRANSLATE("Cursor"), 
+        bitsPerPixel);
     strcpy(info->MIME, kICOMimeType);
 
     return B_OK;

src/add-ons/translators/ico/main.cpp

@@ -9 +9 @@
 
 #include "TranslatorWindow.h"
 #include <Application.h>
+#include <Catalog.h>
 
+#undef B_TRANSLATE_CONTEXT
+#define B_TRANSLATE_CONTEXT "main"
 
+
 int
 main(int /*argc*/, char **/*argv*/)
 {
     BApplication app("application/x-vnd.Haiku-ICOTranslator");
 
     status_t result;
-    result = LaunchTranslatorWindow(new ICOTranslator, "ICO Settings", BRect(0, 0, 225, 175));
+    result = LaunchTranslatorWindow(new ICOTranslator, 
+        B_TRANSLATE("ICO Settings"), BRect(0, 0, 225, 175));
     if (result != B_OK)
         return 1;
 

src/add-ons/translators/ico/Jamfile

@@ -10 +10 @@
     ICOTranslator.cpp
     ConfigView.cpp
     ICO.cpp
-    : be translation libtranslatorsutils.a $(TARGET_LIBSUPC++)
-    $(HAIKU_LOCALE_LIBS)
+    : be translation libtranslatorsutils.a $(TARGET_LIBSUPC++) $(HAIKU_LOCALE_LIBS)
     : true
 ;
 
+DoCatalogs ICOTranslator :
+    x-vnd.Haiku-ICOTranslator
+    :
+    ConfigView.cpp
+    ICOTranslator.cpp
+;
+
 Package haiku-translationkit-cvs :
     ICOTranslator
     : boot home config add-ons Translators