Adopt use of gnulib for portability.

[pspp-builds.git] / src / format.c

diff --git a/src/format.c b/src/format.c
index 5e06ab2291e43ff4f40efcaeb2fbae4bcfe2a569..a37f71e814082bc6fadc02df4ce778f724baf162 100644 (file)
--- a/src/format.c
+++ b/src/format.c
@@ -28,6 +28,9 @@
 #include "str.h"
 #include "var.h"
 
+#include "gettext.h"
+#define _(msgid) gettext (msgid)
+
 #define DEFFMT(LABEL, NAME, N_ARGS, IMIN_W, IMAX_W, OMIN_W, OMAX_W, CAT, \
               OUTPUT, SPSS_FMT) \
        {NAME, N_ARGS, IMIN_W, IMAX_W, OMIN_W, OMAX_W, CAT, OUTPUT, SPSS_FMT},
@@ -129,8 +132,8 @@ check_common_specifier (const struct fmt_spec *spec, bool emit_error)
     {
       if (emit_error)
         msg (SE, _("Format %s specifies an odd width %d, but "
-                   "format %s requires an even width."),
-             str, spec->w, f->name, f->Imin_w, f->Imax_w);
+                   "an even width is required."),
+             str, spec->w);
       return false;
     }
   if (f->n_args > 1 && (spec->d < 0 || spec->d > 16))
@@ -213,7 +216,7 @@ check_output_specifier (const struct fmt_spec *spec, int emit_error)
                    "many decimal places as the field width, which "
                    "fails to allow space for a decimal point.  "
                    "Try %s%d.%d instead."),
-             str, f->name, f->name, spec->d + 1, spec->d);
+             str, f->name, spec->d + 1, spec->d);
       return 0;
     }
   return 1;