Ticket #7125: hpgstranslator-localization.patch

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

@@ -8 +8 @@
 #include "ConfigView.h"
 #include "HPGSTranslator.h"
 
+#include <Catalog.h>
 #include <StringView.h>
 #include <CheckBox.h>
 
 #include <stdio.h>
 #include <string.h>
 
+#undef B_TRANSLATE_CONTEXT
+#define B_TRANSLATE_CONTEXT "ConfigView"
 
+
 ConfigView::ConfigView(const BRect &frame, uint32 resize, uint32 flags)
-    : BView(frame, "HPGSTranslator Settings", resize, flags)
+    : BView(frame, B_TRANSLATE("HPGSTranslator Settings"), resize, flags)
 {
     SetViewColor(ui_color(B_PANEL_BACKGROUND_COLOR));
 
@@ -25 +29 @@
     float height = fontHeight.descent + fontHeight.ascent + fontHeight.leading;
 
     BRect rect(10, 10, 200, 10 + height);
-    BStringView *stringView = new BStringView(rect, "title", "HPGS images");
+    BStringView *stringView = new BStringView(rect, "title", 
+        B_TRANSLATE("HPGS images"));
     stringView->SetFont(be_bold_font);
     stringView->ResizeToPreferred();
     AddChild(stringView);
 
     rect.OffsetBy(0, height + 10);
     char version[256];
-    sprintf(version, "Version %d.%d.%d, %s",
+    sprintf(version, B_TRANSLATE("Version %d.%d.%d, %s"),
         int(B_TRANSLATION_MAJOR_VERSION(HPGS_TRANSLATOR_VERSION)),
         int(B_TRANSLATION_MINOR_VERSION(HPGS_TRANSLATOR_VERSION)),
         int(B_TRANSLATION_REVISION_VERSION(HPGS_TRANSLATOR_VERSION)),
@@ -50 +55 @@
     AddChild(stringView);
 
     rect.OffsetBy(0, height + 10);
-    stringView = new BStringView(rect, "copyright2", "Based on HPGS (http://hpgs.berlios.de)");
+    stringView = new BStringView(rect, "copyright2", B_TRANSLATE("Based on HPGS (http://hpgs.berlios.de)"));
     stringView->ResizeToPreferred();
     AddChild(stringView);
 

src/add-ons/translators/hpgs/ReadHelper.h

@@ -90 +90 @@
     unsigned char *iptr = (unsigned char *)ptr;
     size_t i = 0;
     for (; i < nmemb; i++) {
-        if (size != stream->buffer->Read(iptr, size))
+        if (size != (size_t)stream->buffer->Read(iptr, size))
             break;
         iptr += size;
     }

src/add-ons/translators/hpgs/Jamfile

@@ -49 +49 @@
     : true
 ;
 
+DoCatalogs HPGSTranslator :
+    x-vnd.Haiku-HPGSTranslator
+    :
+    ConfigView.cpp
+    HPGSTranslator.cpp
+;
+
 SEARCH on [ FGristFiles $(sources) ] = [ FDirName $(SUBDIR) lib ] ;

src/add-ons/translators/hpgs/HPGSTranslator.cpp

@@ -10 +10 @@
 
 #include "hpgsimage.h"
 
+#include <Catalog.h>
 #include <Messenger.h>
 #include <TranslatorRoster.h>
 
@@ -17 +18 @@
 #include <stdio.h>
 #include <string.h>
 
+#undef B_TRANSLATE_CONTEXT
+#define B_TRANSLATE_CONTEXT "HPGSTranslator"
+
+
 typedef struct my_hpgs_png_image_st {
     hpgs_png_image image;
     BPositionIO *target;
@@ -80 +85 @@
 
 
 HPGSTranslator::HPGSTranslator()
-    : BaseTranslator("HPGS images", "HPGS image translator",
+    : BaseTranslator(B_TRANSLATE("HPGS images"), 
+        B_TRANSLATE("HPGS image translator"),
         HPGS_TRANSLATOR_VERSION,
         sInputFormats, kNumInputFormats,
         sOutputFormats, kNumOutputFormats,
@@ -115 +121 @@
     hpgs_bool multipage = HPGS_FALSE;
     hpgs_bool ignore_ps = HPGS_FALSE;
     hpgs_bool do_linewidth = HPGS_TRUE;
-    hpgs_device *size_dev = (hpgs_device *)hpgs_new_plotsize_device(ignore_ps, do_linewidth);
-    hpgs_reader *reader = hpgs_new_reader(istream, size_dev, multipage, verbosity);
+    hpgs_device *size_dev = (hpgs_device *)hpgs_new_plotsize_device(ignore_ps, 
+        do_linewidth);
+    hpgs_reader *reader = hpgs_new_reader(istream, size_dev, multipage, 
+        verbosity);
     if (hpgs_read(reader, HPGS_FALSE) == B_OK) {
         info->type = HPGS_IMAGE_FORMAT;
         info->group = B_TRANSLATOR_BITMAP;
         info->quality = HPGS_IN_QUALITY;
         info->capability = HPGS_IN_CAPABILITY;
-        snprintf(info->name, sizeof(info->name), "HPGS image");
+        snprintf(info->name, sizeof(info->name), B_TRANSLATE("HPGS image"));
         strcpy(info->MIME, "vector/x-hpgl2");
     } else
         err = B_NO_TRANSLATOR;
@@ -175 +183 @@
     size_dev = (hpgs_device *)hpgs_new_plotsize_device(ignore_ps, do_linewidth);
     hpgs_reader *reader = hpgs_new_reader(istream, size_dev, multipage, verbosity);
     if (hpgs_read(reader, HPGS_FALSE)) {
-        fprintf(stderr, "no hpgs\n");
+        fprintf(stderr, B_TRANSLATE("no hpgs\n"));
         err = B_NO_TRANSLATOR;
         goto err1;
     }
 
     if (hpgs_getplotsize(size_dev,1,&bbox)<0) {
-        fprintf(stderr, "no hpgs\n");
+        fprintf(stderr, B_TRANSLATE("no hpgs\n"));
         err = B_NO_TRANSLATOR;
         goto err1;
     }
@@ -208 +216 @@
 
     plot_dev = (hpgs_device *)pdv;
     if (hpgs_reader_imbue(reader, plot_dev)) {
-        fprintf(stderr, hpgs_i18n("Error: Cannot imbue plot device to reader: %s\n"),
-            hpgs_get_error());
+        fprintf(stderr, hpgs_i18n(B_TRANSLATE("Error: Cannot imbue plot "
+            "device to reader: %s\n")), hpgs_get_error());
         err = B_NO_TRANSLATOR;
         goto err2;
     }
@@ -227 +235 @@
         B_SWAP_HOST_TO_BENDIAN);
     bytesWritten = target->Write(&header, sizeof(TranslatorBitmap));
     if (bytesWritten < B_OK) {
-        fprintf(stderr, "Write error %s\n", strerror(bytesWritten));
+        fprintf(stderr, B_TRANSLATE("Write error %s\n"), 
+            strerror(bytesWritten));
         err = bytesWritten;
         goto err2;
     }
@@ -238 +247 @@
     }
 
     if (err == B_OK && hpgs_read(reader, HPGS_FALSE)) {
-        fprintf(stderr, hpgs_i18n("Error: Cannot process plot data %s\n"), hpgs_get_error());
+        fprintf(stderr, hpgs_i18n(B_TRANSLATE("Error: Cannot process plot "
+            "data %s\n")), hpgs_get_error());
         err = B_NO_TRANSLATOR;
     }