Ticket #7137: jpegtranslator-localization.patch

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

@@ -35 +35 @@
 #include "exif_parser.h"
 
 #include <Alignment.h>
+#include <Catalog.h>
 #include <GridLayoutBuilder.h>
 #include <GroupLayoutBuilder.h>
 #include <TabView.h>
 #include <TextView.h>
 
+#undef B_TRANSLATE_CONTEXT
+#define B_TRANSLATE_CONTEXT "JPEGTranslator"
 
 #define MARKER_EXIF 0xe1
 
@@ -514 +517 @@
         new BMessage(VIEW_MSG_SET_QUALITY), 0, 100);
     fQualitySlider->SetHashMarks(B_HASH_MARKS_BOTTOM);
     fQualitySlider->SetHashMarkCount(10);
-    fQualitySlider->SetLimitLabels("Low", "High");
+    fQualitySlider->SetLimitLabels(B_TRANSLATE("Low"), B_TRANSLATE("High"));
     fQualitySlider->SetValue(fSettings->SetGetInt32(JPEG_SET_QUALITY, NULL));
 
     fSmoothingSlider = new SSlider("smoothing", VIEW_LABEL_SMOOTHING,
         new BMessage(VIEW_MSG_SET_SMOOTHING), 0, 100);
     fSmoothingSlider->SetHashMarks(B_HASH_MARKS_BOTTOM);
     fSmoothingSlider->SetHashMarkCount(10);
-    fSmoothingSlider->SetLimitLabels("None", "High");
+    fSmoothingSlider->SetLimitLabels(B_TRANSLATE("None"), B_TRANSLATE("High"));
     fSmoothingSlider->SetValue(
         fSettings->SetGetInt32(JPEG_SET_SMOOTHING, NULL));
 
@@ -785 +788 @@
                 &longJumpBuffer);
         }
     } catch (...) {
-        fprintf(stderr, "libjpeg encoutered a critical error "
-            "(caught C++ exception).\n");
+        fprintf(stderr, B_TRANSLATE("libjpeg encoutered a critical error "
+            "(caught C++ exception).\n"));
         return B_ERROR;
     }
 
@@ -939 +942 @@
             break;
 
         default:
-            fprintf(stderr, "Wrong type: Color space not implemented.\n");
+            fprintf(stderr, 
+                B_TRANSLATE("Wrong type: Color space not implemented.\n"));
             return B_ERROR;
     }
     out_row_bytes = jpg_input_components * width;
@@ -1093 +1097 @@
     if (cinfo.out_color_space != JCS_RGB) {
         switch (cinfo.out_color_space) {
             case JCS_UNKNOWN:       /* error/unspecified */
-                fprintf(stderr, "From Type: Jpeg uses unknown color type\n");
+                fprintf(stderr, 
+                    B_TRANSLATE("From Type: Jpeg uses unknown color type\n"));
                 break;
             case JCS_GRAYSCALE:     /* monochrome */
                 // Check if user wants to read only as RGB32 or not
@@ -1125 +1130 @@
                     converter = convert_from_CMYK_to_32;
                 break;
             default:
-                fprintf(stderr, "From Type: Jpeg uses hmm... i don't know really :(\n");
+                fprintf(stderr, 
+                    B_TRANSLATE("From Type: Jpeg uses hmm... i don't know "
+                    "really :(\n"));
                 break;
         }
     }

src/add-ons/translators/jpeg/Jamfile

@@ -16 +16 @@
     be_jerror.cpp
     exif_parser.cpp
     JPEGTranslator.cpp
-    : be translation libtranslatorsutils.a libjpeg.so $(TARGET_LIBSTDC++)
+    : be translation libtranslatorsutils.a libjpeg.so 
+$(TARGET_LIBSTDC++) $(HAIKU_LOCALE_LIBS)
     $(HAIKU_LOCALE_LIBS)
     : true
 ;
 
+DoCatalogs JPEGTranslator :
+    x-vnd.Haiku-JPEGTranslator
+    :
+    JPEGTranslator.cpp
+    exif_parser.cpp
+    be_jerror.cpp
+;
+
 Package haiku-translationkit-cvs :
     JPEGTranslator :
     boot home config add-ons Translators ;

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>
@@ -15 +16 @@
 
 #include <ReadHelper.h>
 
+#undef B_TRANSLATE_CONTEXT
+#define B_TRANSLATE_CONTEXT "exit_parser"
+
+
 using std::set;
 
 enum {
@@ -29 +34 @@
 };
 
 static const convert_tag kDefaultTags[] = {
-    {TAG_MAKER,         B_ANY_TYPE,     "Maker"},
-    {TAG_MODEL,         B_ANY_TYPE,     "Model"},
-    {TAG_ORIENTATION,   B_INT32_TYPE,   "Orientation"},
-    {TAG_EXPOSURE_TIME, B_DOUBLE_TYPE,  "ExposureTime"},
-    {TAG_ISO,           B_INT32_TYPE,   "ISO"},
+    {TAG_MAKER,         B_ANY_TYPE,     B_TRANSLATE_MARK("Maker")},
+    {TAG_MODEL,         B_ANY_TYPE,     B_TRANSLATE_MARK("Model")},
+    {TAG_ORIENTATION,   B_INT32_TYPE,   B_TRANSLATE_MARK("Orientation")},
+    {TAG_EXPOSURE_TIME, B_DOUBLE_TYPE,  B_TRANSLATE_MARK("ExposureTime")},
+    {TAG_ISO,           B_INT32_TYPE,   B_TRANSLATE_MARK("ISO")},
 };
 static const size_t kNumDefaultTags = sizeof(kDefaultTags)
     / sizeof(kDefaultTags[0]);

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

@@ -39 +39 @@
 
 // Be headers
 #include <Alert.h>
+#include <Catalog.h>
 #include <stdio.h>
 
 // JPEG headers
@@ -50 +51 @@
 #include "JPEGTranslator.h"
 #include "TranslatorSettings.h"
 
+#undef B_TRANSLATE_CONTEXT
+#define B_TRANSLATE_CONTEXT "be_jerror"
 
 // Since Translator doesn't use it's own error table, we can use error_mgr's
 // variables to store some usefull data.
@@ -68 +71 @@
     /* Create the message */
     (*cinfo->err->format_message) (cinfo, buffer);
 
-    fprintf(stderr, "JPEG Library Error: %s\n", buffer);
+    fprintf(stderr, B_TRANSLATE("JPEG Library Error: %s\n"), buffer);
 
     jmp_buf longJumpBuffer;
     memcpy(&longJumpBuffer, &(cinfo->err->long_jump_buffer), sizeof(jmp_buf));
@@ -97 +100 @@
     /* If it's compressing or decompressing and user turned messages on */
     if (!cinfo->is_decompressor || cinfo->err->ShowReadWarnings) {
         /* show warning message */
-        fprintf(stderr, "JPEG Library Warning: %s\n", buffer);
+        fprintf(stderr, B_TRANSLATE("JPEG Library Warning: %s\n"), buffer);
     }
 }