Ticket #7118: bmp-translator-localization-update.patch

src/add-ons/translators/bmp/BMPMain.cpp

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

src/add-ons/translators/bmp/Jamfile

@@ -14 +14 @@
     : true
 ;
 
+DoCatalogs BMPTranslator :
+    x-vnd.Haiku-BMPTranslator
+    :
+    BMPMain.cpp
+    BMPTranslator.cpp
+    BMPView.cpp
+;
+
 Package haiku-translationkit-cvs :
     BMPTranslator :
     boot home config add-ons Translators ;
 
-

src/add-ons/translators/bmp/BMPTranslator.cpp

@@ -10 +10 @@
 #include "BMPView.h"
 
 #include <algorithm>
+#include <Catalog.h>
 #include <new>
 #include <stdio.h>
 #include <stdlib.h>
@@ -24 +25 @@
 //#define ERROR(x) printf(x);
 #define ERROR(x)
 
+#undef B_TRANSLATE_CONTEXT
+#define B_TRANSLATE_CONTEXT "BMPTranslator"
+
+
 // The input formats that this translator supports.
 translation_format gInputFormats[] = {
     {
@@ -116 +121 @@
 // Returns:
 // ---------------------------------------------------------------
 BMPTranslator::BMPTranslator()
-    : BaseTranslator("BMP images", "BMP image translator",
+    : BaseTranslator(B_TRANSLATE("BMP images"), 
+        B_TRANSLATE("BMP image translator"),
         BMP_TRANSLATOR_VERSION,
         gInputFormats, sizeof(gInputFormats) / sizeof(translation_format),
         gOutputFormats, sizeof(gOutputFormats) / sizeof(translation_format),
-        "BMPTranslator_Settings",
+        B_TRANSLATE("BMPTranslator_Settings"),
         gDefaultSettings, sizeof(gDefaultSettings) / sizeof(TranSetting),
         B_TRANSLATOR_BITMAP, B_BMP_FORMAT)
 {
@@ -357 +363 @@
             outInfo->group = B_TRANSLATOR_BITMAP;
             outInfo->quality = BMP_IN_QUALITY;
             outInfo->capability = BMP_IN_CAPABILITY;
-            sprintf(outInfo->name, "BMP image (MS format, %d bits",
+            sprintf(outInfo->name, 
+                B_TRANSLATE_COMMENT("BMP image (MS format, %d bits", 
+                "Ignore missing closing round bracket"), 
                 msheader.bitsperpixel);
             if (msheader.compression)
                 strcat(outInfo->name, ", RLE)");
@@ -426 +434 @@
             outInfo->group = B_TRANSLATOR_BITMAP;
             outInfo->quality = BMP_IN_QUALITY;
             outInfo->capability = BMP_IN_CAPABILITY;
-            sprintf(outInfo->name, "BMP image (OS/2 format, %d bits)",
-                os2header.bitsperpixel);
+            sprintf(outInfo->name, B_TRANSLATE("BMP image (OS/2 format, "
+                "%d bits)"), os2header.bitsperpixel);
             strcpy(outInfo->MIME, "image/x-bmp");
         }
         if (pfileheader && pmsheader) {
@@ -1884 +1892 @@
 BView *
 BMPTranslator::NewConfigView(TranslatorSettings *settings)
 {
-    return new BMPView(BRect(0, 0, 225, 175), "BMPTranslator Settings",
-        B_FOLLOW_ALL, B_WILL_DRAW, settings);
+    return new BMPView(BRect(0, 0, 225, 175), 
+        B_TRANSLATE("BMPTranslator Settings"), B_FOLLOW_ALL, B_WILL_DRAW, 
+        settings);
 }

src/add-ons/translators/bmp/BMPView.cpp

@@ -13 +13 @@
 #include "BMPView.h"
 #include "BMPTranslator.h"
 
+#include <Catalog.h>
 #include <StringView.h>
 
 #include <stdio.h>
 
+#undef B_TRANSLATE_CONTEXT
+#define B_TRANSLATE_CONTEXT "BMPView"
 
+
 BMPView::BMPView(const BRect &frame, const char *name, uint32 resizeMode,
         uint32 flags, TranslatorSettings *settings)
     : BView(frame, name, resizeMode, flags)
@@ -30 +34 @@
     float height = fontHeight.descent + fontHeight.ascent + fontHeight.leading;
 
     BRect rect(10, 10, 200, 10 + height);
-    BStringView *stringView = new BStringView(rect, "title", "BMP image translator");
+    BStringView *stringView = new BStringView(rect, "title", 
+        B_TRANSLATE("BMP image translator"));
     stringView->SetFont(be_bold_font);
     stringView->ResizeToPreferred();
     AddChild(stringView);
@@ -39 +44 @@
 
     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(BMP_TRANSLATOR_VERSION)),
         int(B_TRANSLATION_MINOR_VERSION(BMP_TRANSLATOR_VERSION)),
         int(B_TRANSLATION_REVISION_VERSION(BMP_TRANSLATOR_VERSION)),
@@ -55 +60 @@
     height = fontHeight.descent + fontHeight.ascent + fontHeight.leading;
 
     rect.OffsetBy(0, height + 5);
-    stringView = new BStringView(rect, "Copyright", B_UTF8_COPYRIGHT "2002-2006 Haiku Inc.");
+    stringView = new BStringView(rect, "Copyright", B_UTF8_COPYRIGHT "2002-2010 Haiku Inc.");
     stringView->ResizeToPreferred();
     AddChild(stringView);
 

src/add-ons/translators/bmp/BMPTranslator.h

@@ -29 +29 @@
 #ifndef BMP_TRANSLATOR_H
 #define BMP_TRANSLATOR_H
 
+#include <ByteOrder.h>
+#include <Catalog.h>
+#include <DataIO.h>
+#include <GraphicsDefs.h>
+#include <InterfaceDefs.h>
+#include <Locale.h>
 #include <Translator.h>
 #include <TranslatorFormats.h>
 #include <TranslationDefs.h>
-#include <GraphicsDefs.h>
-#include <InterfaceDefs.h>
-#include <DataIO.h>
-#include <ByteOrder.h>
+
 #include "BaseTranslator.h"
 
 #define BMP_NO_COMPRESS 0