Ticket #7139: rtftranslator-localization.patch

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

@@ -7 +7 @@
 #include "ConfigView.h"
 #include "RTFTranslator.h"
 
+#include <Catalog.h>
 #include <StringView.h>
 
 #include <stdio.h>
 
+#undef B_TRANSLATE_CONTEXT
+#define B_TRANSLATE_CONTEXT "ConfigView"
 
+
 ConfigView::ConfigView(const BRect &frame, uint32 resize, uint32 flags)
-    : BView(frame, "RTF-Translator Settings", resize, flags)
+    : BView(frame, B_TRANSLATE("RTF-Translator Settings"), resize, flags)
 {
     SetViewColor(ui_color(B_PANEL_BACKGROUND_COLOR));
 
@@ -22 +26 @@
     float height = fontHeight.descent + fontHeight.ascent + fontHeight.leading;
 
     BRect rect(10, 10, 200, 10 + height);
-    BStringView *stringView = new BStringView(rect, "title", "Rich Text Format (RTF) files");
+    BStringView *stringView = new BStringView(rect, "title", 
+        B_TRANSLATE("Rich Text Format (RTF) files"));
     stringView->SetFont(be_bold_font);
     stringView->ResizeToPreferred();
     AddChild(stringView);
@@ -31 +36 @@
 
     rect.OffsetBy(0, height + 10);
     char version[256];
-    snprintf(version, sizeof(version), "Version %d.%d.%d, %s",
-        int(B_TRANSLATION_MAJOR_VERSION(RTF_TRANSLATOR_VERSION)),
-        int(B_TRANSLATION_MINOR_VERSION(RTF_TRANSLATOR_VERSION)),
-        int(B_TRANSLATION_REVISION_VERSION(RTF_TRANSLATOR_VERSION)),
-        __DATE__);
+    snprintf(version, sizeof(version), B_TRANSLATE("Version %d.%d.%d, %s"),
+        static_cast<int>(B_TRANSLATION_MAJOR_VERSION(RTF_TRANSLATOR_VERSION)),
+        static_cast<int>(B_TRANSLATION_MINOR_VERSION(RTF_TRANSLATOR_VERSION)),
+        static_cast<int>(B_TRANSLATION_REVISION_VERSION(
+            RTF_TRANSLATOR_VERSION)), __DATE__);
     stringView = new BStringView(rect, "version", version);
     stringView->ResizeToPreferred();
     AddChild(stringView);
@@ -47 +52 @@
     height = fontHeight.descent + fontHeight.ascent + fontHeight.leading;
 
     rect.OffsetBy(0, height + 5);
-    stringView = new BStringView(rect, "Copyright", B_UTF8_COPYRIGHT "2004-2006 Haiku Inc.");
+    stringView = new BStringView(rect, 
+        "Copyright", B_UTF8_COPYRIGHT "2004-2006 Haiku Inc.");
     stringView->ResizeToPreferred();
     AddChild(stringView);
 

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

@@ -8 +8 @@
 #include <string.h>
 
 #include <Application.h>
+#include <Catalog.h>
 #include <FileIO.h>
 #include <TranslatorRoster.h>
 
@@ -17 +18 @@
 #include "RTF.h"
 #include "RTFTranslator.h"
 
+#undef B_TRANSLATE_CONTEXT
+#define B_TRANSLATE_CONTEXT "main"
 
+
 int
 main(int argc, char** argv)
 {
@@ -30 +34 @@
             BFile input;
             status_t status = input.SetTo(argv[i], B_READ_ONLY);
             if (status != B_OK) {
-                fprintf(stderr, "Could not open file \"%s\": %s\n", argv[i],
+                fprintf(stderr, 
+                    B_TRANSLATE("Could not open file \"%s\": %s\n"), argv[i],
                     strerror(status));
                 result = 1;
                 continue;
@@ -41 +46 @@
 
             status = parser.Parse(header);
             if (status != B_OK) {
-                fprintf(stderr, "Could not convert file \"%s\": %s\n", argv[i],
-                    strerror(status));
+                fprintf(stderr, 
+                    B_TRANSLATE("Could not convert file \"%s\": %s\n"), 
+                        argv[i], strerror(status));
                 result = 1;
                 continue;
             }
@@ -56 +62 @@
     BApplication app("application/x-vnd.Haiku-RTFTranslator");
 
     status_t result;
-    result = LaunchTranslatorWindow(new RTFTranslator, "RTF Settings",
-        BRect(0, 0, 225, 175));
+    result = LaunchTranslatorWindow(new RTFTranslator, 
+        B_TRANSLATE("RTF Settings"), BRect(0, 0, 225, 175));
     if (result != B_OK)
         return 1;
 

src/add-ons/translators/rtf/RTFTranslator.cpp

@@ -9 +9 @@
 #include "RTF.h"
 #include "convert.h"
 
+#include <Catalog.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
 
+#undef B_TRANSLATE_CONTEXT
+#define B_TRANSLATE_CONTEXT "RTFTranslator"
 
 #define READ_BUFFER_SIZE 2048
 #define DATA_BUFFER_SIZE 64
@@ -54 +57 @@
 RTFTranslator::RTFTranslator()
 {
     char info[256];
-    sprintf(info, "Rich Text Format translator v%d.%d.%d %s",
-        int(B_TRANSLATION_MAJOR_VERSION(RTF_TRANSLATOR_VERSION)),
-        int(B_TRANSLATION_MINOR_VERSION(RTF_TRANSLATOR_VERSION)),
-        int(B_TRANSLATION_REVISION_VERSION(RTF_TRANSLATOR_VERSION)),
+    sprintf(info, B_TRANSLATE("Rich Text Format translator v%d.%d.%d %s"),
+        static_cast<int>(B_TRANSLATION_MAJOR_VERSION(RTF_TRANSLATOR_VERSION)),
+        static_cast<int>(B_TRANSLATION_MINOR_VERSION(RTF_TRANSLATOR_VERSION)),
+        static_cast<int>(B_TRANSLATION_REVISION_VERSION(
+            RTF_TRANSLATOR_VERSION)),
         __DATE__);
 
     fInfo = strdup(info);
@@ -73 +77 @@
 const char *
 RTFTranslator::TranslatorName() const
 {
-    return "RTF text files";
+    return B_TRANSLATE("RTF text files");
 }
 
 
 const char *
 RTFTranslator::TranslatorInfo() const
 {
-    return "Rich Text Format Translator";
+    return B_TRANSLATE("Rich Text Format Translator");
 }
 
 
@@ -131 +135 @@
     info->group = B_TRANSLATOR_TEXT;
     info->quality = RTF_IN_QUALITY;
     info->capability = RTF_IN_CAPABILITY;
-    strcpy(info->name, "RichTextFormat file");
+    strcpy(info->name, B_TRANSLATE("RichTextFormat file"));
     strcpy(info->MIME, "text/rtf");
 
     return B_OK;
@@ -168 +172 @@
 
 
 status_t
-RTFTranslator::MakeConfigurationView(BMessage *ioExtension, BView **_view, BRect *_extent)
+RTFTranslator::MakeConfigurationView(BMessage *ioExtension, BView **_view, 
+    BRect *_extent)
 {
     if (_view == NULL || _extent == NULL)
         return B_BAD_VALUE;

src/add-ons/translators/rtf/Jamfile

@@ -16 +16 @@
     RTF.cpp
     RTFTranslator.cpp
 
-    : be translation libtranslatorsutils.a $(TARGET_LIBSUPC++)
+    : be translation libtranslatorsutils.a $(TARGET_LIBSUPC++) 
+$(HAIKU_LOCALE_LIBS)
     $(HAIKU_LOCALE_LIBS)
     : true
 ;
+
+DoCatalogs RTF-Translator :
+    x-vnd.Haiku-RTFTranslator
+    :
+    main.cpp
+    RTFTranslator.cpp
+    ConfigView.cpp
+;