Ticket #7229: jpeg-translators-add-ons-localization.patch

src/add-ons/translators/jpeg/JPEGTranslator.cpp

@@ -662 +662 @@
     BView(name, 0, new BGroupLayout(B_VERTICAL))
 {
     BAlignment labelAlignment = BAlignment(B_ALIGN_LEFT, B_ALIGN_TOP);
-    BStringView* title = new BStringView("Title", sTranslatorName);
+    BString str1(sTranslatorName);
+    str1.ReplaceFirst("JPEG images", B_TRANSLATE("JPEG images"));
+    BStringView* title = new BStringView("Title", str1.String());
     title->SetFont(be_bold_font);
     title->SetExplicitAlignment(labelAlignment);
 
@@ -674 +676 @@
     version->SetExplicitAlignment(labelAlignment);
 
     BTextView* infoView = new BTextView("info");
-    infoView->SetText(sTranslatorInfo);
+    BString str2(sTranslatorInfo);
+    str2.ReplaceFirst("Based on IJG library ©  1994-2009, Thomas G. Lane, "
+        "Guido Vollbeding.\n", B_TRANSLATE("Based on IJG library ©  1994-2009, "
+        "Thomas G. Lane, Guido Vollbeding.\n"));
+    str2.ReplaceFirst("with \"lossless\" encoding support patch by Ken "
+        "Murchison\n", B_TRANSLATE("with \"lossless\" encoding support patch "
+        "by Ken Murchison\n"));
+    str2.ReplaceFirst("With some colorspace conversion routines by Magnus "
+        "Hellman\n", B_TRANSLATE("With some colorspace conversion routines by "
+        "Magnus Hellman\n"));
+    infoView->SetText(str2.String());
     infoView->SetViewColor(ui_color(B_PANEL_BACKGROUND_COLOR));
     infoView->MakeEditable(false);
 
@@ -695 +707 @@
     :
     BTabView(name)
 {
-    AddTab(new TranslatorWriteView("Write", settings->Acquire()));
-    AddTab(new TranslatorReadView("Read", settings->Acquire()));
-    AddTab(new TranslatorAboutView("About"));
+    AddTab(new TranslatorWriteView(B_TRANSLATE("Write"), settings->Acquire()));
+    AddTab(new TranslatorReadView(B_TRANSLATE("Read"), settings->Acquire()));
+    AddTab(new TranslatorAboutView(B_TRANSLATE("About")));
 
     settings->Release();
 
@@ -788 +800 @@
                 &longJumpBuffer);
         }
     } catch (...) {
-        fprintf(stderr, B_TRANSLATE("libjpeg encountered a critical error "
-            "(caught C++ exception).\n"));
+        fprintf(stderr, "libjpeg encountered a critical error (caught C++ "
+            "exception).\n");
         return B_ERROR;
     }
 
@@ -943 +955 @@
 
         default:
             fprintf(stderr, 
-                B_TRANSLATE("Wrong type: Color space not implemented.\n"));
+                    "Wrong type: Color space not implemented.\n");
             return B_ERROR;
     }
     out_row_bytes = jpg_input_components * width;
@@ -1098 +1110 @@
         switch (cinfo.out_color_space) {
             case JCS_UNKNOWN:       /* error/unspecified */
                 fprintf(stderr, 
-                    B_TRANSLATE("From Type: Jpeg uses unknown color type\n"));
+                    "From Type: Jpeg uses unknown color type\n");
                 break;
             case JCS_GRAYSCALE:     /* monochrome */
                 // Check if user wants to read only as RGB32 or not
@@ -1131 +1143 @@
                 break;
             default:
                 fprintf(stderr, 
-                    B_TRANSLATE("From Type: Jpeg uses hmm... i don't know "
-                    "really :(\n"));
+                    "From Type: Jpeg uses hmm... i don't know really :(\n");
                 break;
         }
     }
@@ -1279 +1290 @@
             info->group = formats[i].group;
             info->quality = formats[i].quality;
             info->capability = formats[i].capability;
-            strcpy(info->name, formats[i].name);
+            BString str1(formats[i].name);
+            str1.ReplaceFirst("Be Bitmap Format (JPEGTranslator)", 
+                B_TRANSLATE("Be Bitmap Format (JPEGTranslator)"));
+            strncpy(info->name, str1.String(), sizeof(info->name));
             strcpy(info->MIME,  formats[i].MIME);
             return B_OK;
         }

src/add-ons/translators/jpeg/JPEGTranslator.h

@@ -34 +34 @@
 
 #include <Alert.h>
 #include <Application.h>
+#include <Catalog.h>
 #include <CheckBox.h>
 #include <FindDirectory.h>
 #include <Path.h>
@@ -52 +53 @@
 
 #include "BaseTranslator.h"
 
+#undef B_TRANSLATE_CONTEXT
+#define B_TRANSLATE_CONTEXT "JPEGTranslator"
+
 // Settings
 #define SETTINGS_FILE   "JPEGTranslator"
 
@@ -67 +71 @@
 #define VIEW_MSG_SET_SHOWREADERRORBOX 'JSEB'
 
 // View labels
-#define VIEW_LABEL_QUALITY "Output quality"
-#define VIEW_LABEL_SMOOTHING "Output smoothing strength"
-#define VIEW_LABEL_PROGRESSIVE "Use progressive compression"
-#define VIEW_LABEL_OPTIMIZECOLORS "Prevent colors 'washing out'"
-#define VIEW_LABEL_SMALLERFILE "Make file smaller (sligthtly worse quality)"
-#define VIEW_LABEL_GRAY1ASRGB24 "Write black-and-white images as RGB24"
-#define VIEW_LABEL_ALWAYSRGB32 "Read greyscale images as RGB32"
-#define VIEW_LABEL_PHOTOSHOPCMYK "Use CMYK code with 0 for 100% ink coverage"
-#define VIEW_LABEL_SHOWREADERRORBOX "Show warning messages"
+#define VIEW_LABEL_QUALITY B_TRANSLATE_MARK("Output quality")
+#define VIEW_LABEL_SMOOTHING B_TRANSLATE_MARK("Output smoothing strength")
+#define VIEW_LABEL_PROGRESSIVE B_TRANSLATE_MARK("Use progressive compression")
+#define VIEW_LABEL_OPTIMIZECOLORS B_TRANSLATE_MARK("Prevent colors 'washing out'")
+#define VIEW_LABEL_SMALLERFILE B_TRANSLATE_MARK("Make file smaller (sligthtly worse quality)")
+#define VIEW_LABEL_GRAY1ASRGB24 B_TRANSLATE_MARK("Write black-and-white images as RGB24")
+#define VIEW_LABEL_ALWAYSRGB32 B_TRANSLATE_MARK("Read greyscale images as RGB32")
+#define VIEW_LABEL_PHOTOSHOPCMYK B_TRANSLATE_MARK("Use CMYK code with 0 for 100% ink coverage")
+#define VIEW_LABEL_SHOWREADERRORBOX B_TRANSLATE_MARK("Show warning messages")
 
 // strings for use in TranslatorSettings
 #define JPEG_SET_SMOOTHING "smoothing"

src/add-ons/translators/jpeg/Jamfile

@@ -10 +10 @@
 
 UseLibraryHeaders jpeg ;
 
+AddResources JPEGTranslator : JPEGTranslator.rdef ;
+
 Translator JPEGTranslator :
     be_jdatadst.cpp
     be_jdatasrc.cpp
@@ -24 +26 @@
 DoCatalogs JPEGTranslator :
     x-vnd.Haiku-JPEGTranslator
     :
+    JPEGTranslator.h
     JPEGTranslator.cpp
     exif_parser.cpp
     be_jerror.cpp

src/add-ons/translators/jpeg/exif_parser.cpp

@@ -6 +6 @@
 
 #include "exif_parser.h"
 
+#include <Catalog.h>
 #include <ctype.h>
 #include <set>
 #include <stdio.h>

src/add-ons/translators/jpeg/JPEGTranslator.rdef

@@ +1 @@
+/*
+ * JPEGTranslator.rdef
+ */
+
+resource app_signature "application/x-vnd.Haiku-JPEGTranslator";
+
+resource app_version {
+    major  = 1,
+    middle = 2,
+    minor  = 0,
+    variety = 0,
+    internal = 0,
+    short_info = "1.2.0",
+    long_info = "Haiku JPEGTranslator Add-Ons."
+};