gettextization of error messages

diff --git a/lib/error.c b/lib/error.c
index 3d52c336087f7c3eae92b7f6c56e04b16883cd82..8d98de03af21646ae0710e69b74776e93244da7a 100644 (file)
--- a/lib/error.c
+++ b/lib/error.c
@@ -28,15 +28,15 @@
 #include <comedi_errno.h>
 
 char *__comedilib_error_strings[]={
-       "No error",
-       "Unknown error",
-       "Bad comedi_t structure",
-       "Invalid subdevice",
-       "Invalid channel",
-       "Buffer overflow",
-       "Buffer underflow",
-       "Command not supported",
-       "Not supported",
+       _s("No error"),
+       _s("Unknown error"),
+       _s("Bad comedi_t structure"),
+       _s("Invalid subdevice"),
+       _s("Invalid channel"),
+       _s("Buffer overflow"),
+       _s("Buffer underflow"),
+       _s("Command not supported"),
+       _s("Not supported"),
 };
 #define n_errors (sizeof(__comedilib_error_strings)/sizeof(void *))
 
@@ -62,7 +62,7 @@ char *comedi_strerror(int errnum)
        if(errnum<COMEDI_NOERROR || errnum>=COMEDI_NOERROR+n_errors)
                return strerror(errnum);
 
-       return __comedilib_error_strings[errnum-COMEDI_NOERROR];
+       return _(__comedilib_error_strings[errnum-COMEDI_NOERROR]);
 }
 
 void comedi_perror(const char *s)

diff --git a/lib/libinternal.h b/lib/libinternal.h
index 718f67ab23446c996027f4cafa258700f3c8e091..60109840e896f326bdb77a74ba28b6cf30183fd1 100644 (file)
--- a/lib/libinternal.h
+++ b/lib/libinternal.h
@@ -31,14 +31,23 @@
 #include <sys/ioctl.h>
 #include <fcntl.h>
 #include <stdio.h>
+#include <libintl.h>
 
 #include <comedi_errno.h>
 
-
 /* This indicates a symbol that should not be exported as part of
  * the library.  But I don't know how to make it useful yet. */
 #define INTERNAL
 
+/* gettext()ization */
+
+#ifdef I18N
+#define _(a) gettext((a))
+#else
+#define _(a) (a)
+#endif
+#define _s(a) (a)
+
 
 #define debug_ptr(a)    if(!(a))fprintf(stderr," ** NULL pointer: " __FILE__ ", line %d\n",__LINE__);
 #define debug_int(a)    if((a)<0)fprintf(stderr," ** error: " __FILE__ ", line %d\n",__LINE__);