Ticket #7126: hviftranslator-localization.patch

src/add-ons/translators/hvif/HVIFMain.cpp

@@ -7 +7 @@
  */
 
 #include <Application.h>
+#include <Catalog.h>
 #include "HVIFTranslator.h"
 #include "TranslatorWindow.h"
 
+#undef B_TRANSLATE_CONTEXT
+#define B_TRANSLATE_CONTEXT "HVIFMain"
+
 int
 main(int argc, char *argv[])
 {
     BApplication application("application/x-vnd.Haiku.HVIFTranslator");
-    if (LaunchTranslatorWindow(new HVIFTranslator, "HVIF Settings",
-            BRect(0, 0, 250, 150)) != B_OK)
+    if (LaunchTranslatorWindow(new HVIFTranslator, 
+        B_TRANSLATE("HVIF Settings"), BRect(0, 0, 250, 150)) != B_OK)
         return 1;
 
     application.Run();

src/add-ons/translators/hvif/HVIFTranslator.cpp

@@ -11 +11 @@
 
 #include <Bitmap.h>
 #include <BitmapStream.h>
+#include <Catalog.h>
 #include <IconUtils.h>
 
 #include <stdio.h>
@@ -21 +22 @@
 #define HVIF_TRANSLATION_QUALITY        1.0
 #define HVIF_TRANSLATION_CAPABILITY     1.0
 
+#undef B_TRANSLATE_CONTEXT
+#define B_TRANSLATE_CONTEXT "HVIFTranslator"
+
+
 static const translation_format sInputFormats[] = {
     {
         HVIF_FORMAT_CODE,
@@ -65 +70 @@
 
 
 HVIFTranslator::HVIFTranslator()
-    : BaseTranslator("HVIF icons", "Native Haiku vector icon translator",
+    : BaseTranslator(B_TRANSLATE("HVIF icons"), 
+        B_TRANSLATE("Native Haiku vector icon translator"),
         HVIF_TRANSLATOR_VERSION,
         sInputFormats, kNumInputFormats,
         sOutputFormats, kNumOutputFormats,
@@ -174 +180 @@
 BView *
 HVIFTranslator::NewConfigView(TranslatorSettings *settings)
 {
-    return new HVIFView("HVIFTranslator Settings", B_WILL_DRAW, settings);
+    return new HVIFView(B_TRANSLATE("HVIFTranslator Settings"), 
+        B_WILL_DRAW, settings);
 }

src/add-ons/translators/hvif/Jamfile

@@ -8 +8 @@
     HVIFMain.cpp
     HVIFTranslator.cpp
     HVIFView.cpp
-    : be translation libtranslatorsutils.a $(TARGET_LIBSUPC++)
+    : be translation libtranslatorsutils.a $(TARGET_LIBSUPC++) 
+$(HAIKU_LOCALE_LIBS)
     $(HAIKU_LOCALE_LIBS)
     : true
 ;
+
+DoCatalogs HVIFTranslator :
+    x-vnd.Haiku-HVIFTranslator
+    :
+    HVIFMain.cpp
+    HVIFTranslator.cpp
+    HVIFView.cpp
+;

src/add-ons/translators/hvif/HVIFView.cpp

@@ -9 +9 @@
 #include "HVIFView.h"
 #include "HVIFTranslator.h"
 
+#include <Catalog.h>
 #include <GroupLayoutBuilder.h>
 #include <String.h>
 #include <StringView.h>
@@ -17 +18 @@
 
 #define HVIF_SETTING_RENDER_SIZE_CHANGED    'rsch'
 
+#undef B_TRANSLATE_CONTEXT
+#define B_TRANSLATE_CONTEXT "HVIFView"
 
+
 HVIFView::HVIFView(const char* name, uint32 flags, TranslatorSettings *settings)
     :
     BView(name, flags, new BGroupLayout(B_VERTICAL)),
@@ -26 +30 @@
     BAlignment labelAlignment(B_ALIGN_LEFT, B_ALIGN_NO_VERTICAL);
 
     BStringView* title= new BStringView("title",
-        "Native Haiku icon format translator");
+        B_TRANSLATE("Native Haiku icon format translator"));
     title->SetFont(be_bold_font);
     title->SetExplicitAlignment(labelAlignment);
 
     char versionString[256];
-    snprintf(versionString, sizeof(versionString), "Version %d.%d.%d, %s",
+    snprintf(versionString, sizeof(versionString), 
+        B_TRANSLATE("Version %d.%d.%d, %s"),
         int(B_TRANSLATION_MAJOR_VERSION(HVIF_TRANSLATOR_VERSION)),
         int(B_TRANSLATION_MINOR_VERSION(HVIF_TRANSLATOR_VERSION)),
         int(B_TRANSLATION_REVISION_VERSION(HVIF_TRANSLATOR_VERSION)),
@@ -45 +50 @@
 
 
     int32 renderSize = fSettings->SetGetInt32(HVIF_SETTING_RENDER_SIZE);
-    BString label = "Render size: ";
-    label << renderSize;
+    BString label = B_TRANSLATE("Render size:");
+    label << " " << renderSize;
 
     fRenderSize = new BSlider("renderSize", label.String(),
         NULL, 1, 32, B_HORIZONTAL);
@@ -101 +106 @@
             fSettings->SetGetInt32(HVIF_SETTING_RENDER_SIZE, &value);
             fSettings->SaveSettings();
 
-            BString newLabel = "Render size: ";
-            newLabel << value;
+            BString newLabel = B_TRANSLATE("Render size:");
+            newLabel << " " << value;
             fRenderSize->SetLabel(newLabel.String());
             return;
         }