* lib/xstrtol.h: Include gettext.h.

(_STRTOL_ERROR): Wrap English-language formats inside gettext.
Problem reported by Eric Blake.
* modules/xstrtol (Depends-on): Add gettext-h.

diff --git a/ChangeLog b/ChangeLog
index e8afe7efcde354578e3c855bf557e11031cf7a30..b4a60529d02e891aff665b6dda5444a108c1b167 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-10-19  Paul Eggert  <eggert@cs.ucla.edu>
+
+       * lib/xstrtol.h: Include gettext.h.
+       (_STRTOL_ERROR): Wrap English-language formats inside gettext.
+       Problem reported by Eric Blake.
+       * modules/xstrtol (Depends-on): Add gettext-h.
+
 2006-10-19  Paul Eggert  <eggert@cs.ucla.edu>  (tiny change)
 
        * lib/strftime.c (advance): New macro.

diff --git a/lib/xstrtol.h b/lib/xstrtol.h
index 354fb6b3723340dd60a458c64e4e2a09d43d10b3..475728aa44c908e31713a6e3c477b316ec7f2551 100644 (file)
--- a/lib/xstrtol.h
+++ b/lib/xstrtol.h
@@ -24,6 +24,8 @@
 
 # include <inttypes.h>
 
+# include "gettext.h"
+
 # ifndef _STRTOL_ERROR
 enum strtol_error
   {
@@ -57,18 +59,19 @@ _DECLARE_XSTRTOL (xstrtoumax, uintmax_t)
          abort ();                                                     \
                                                                        \
        case LONGINT_INVALID:                                           \
-         error ((Exit_code), 0, "invalid %s `%s'",                     \
+         error ((Exit_code), 0, gettext ("invalid %s `%s'"),           \
                 (Argument_type_string), (Str));                        \
          break;                                                        \
                                                                        \
        case LONGINT_INVALID_SUFFIX_CHAR:                               \
        case LONGINT_INVALID_SUFFIX_CHAR | LONGINT_OVERFLOW:            \
-         error ((Exit_code), 0, "invalid character following %s in `%s'", \
+         error ((Exit_code), 0,                                        \
+                gettext ("invalid character following %s in `%s'"),    \
                 (Argument_type_string), (Str));                        \
          break;                                                        \
                                                                        \
        case LONGINT_OVERFLOW:                                          \
-         error ((Exit_code), 0, "%s `%s' too large",                   \
+         error ((Exit_code), 0, gettext ("%s `%s' too large"),         \
                 (Argument_type_string), (Str));                        \
          break;                                                        \
        }                                                               \

diff --git a/modules/xstrtol b/modules/xstrtol
index fb7c783a6f4084bc5955e342da55e11f8a9fb8fb..0d136bf88cc045f5076fbdec1959c4878db10402 100644 (file)
--- a/modules/xstrtol
+++ b/modules/xstrtol
@@ -10,6 +10,7 @@ m4/xstrtol.m4
 Depends-on:
 exitfail
 error
+gettext-h
 intprops
 inttypes