Tweak error messages.

diff --git a/src/ChangeLog b/src/ChangeLog
index cea966f7fb53ae7625bade295e3a14e43f9b7fa5..465b32ad6514916a5a918ba7189950f609f89394 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,10 @@
+2002-01-27  Bruno Haible  <bruno@clisp.org>
+
+       * format-elisp.c (format_check): Don't use Java syntax for format
+       argument number in error message.
+       * format-librep.c (format_check): Likewise.
+       * format-pascal.c (format_check): Likewise.
+
 2002-01-24  Bruno Haible  <bruno@clisp.org>
 
        * Makefile.am (LDADD): Use @LTLIBINTL@ instead of @INTLLIBS@.

diff --git a/src/format-elisp.c b/src/format-elisp.c
index 7938bcfb4d5e50216c223c835d18ee1c80902094..fa366eed2d62063898f3ddb3ab2dd5b679620438 100644 (file)
--- a/src/format-elisp.c
+++ b/src/format-elisp.c
@@ -346,7 +346,7 @@ format_check (pos, msgid_descr, msgstr_descr, equality, noisy, pretty_msgstr)
                {
                  error_with_progname = false;
                  error_at_line (0, 0, pos->file_name, pos->line_number,
-                                _("a format specification for argument {%u}, as in '%s', doesn't exist in 'msgid'"),
+                                _("a format specification for argument %u, as in '%s', doesn't exist in 'msgid'"),
                                 spec2->numbered[j].number, pretty_msgstr);
                  error_with_progname = true;
                }
@@ -361,7 +361,7 @@ format_check (pos, msgid_descr, msgstr_descr, equality, noisy, pretty_msgstr)
                    {
                      error_with_progname = false;
                      error_at_line (0, 0, pos->file_name, pos->line_number,
-                                    _("a format specification for argument {%u} doesn't exist in '%s'"),
+                                    _("a format specification for argument %u doesn't exist in '%s'"),
                                     spec1->numbered[i].number, pretty_msgstr);
                      error_with_progname = true;
                    }
@@ -386,7 +386,7 @@ format_check (pos, msgid_descr, msgstr_descr, equality, noisy, pretty_msgstr)
                      {
                        error_with_progname = false;
                        error_at_line (0, 0, pos->file_name, pos->line_number,
-                                      _("format specifications in 'msgid' and '%s' for argument {%u} are not the same"),
+                                      _("format specifications in 'msgid' and '%s' for argument %u are not the same"),
                                       pretty_msgstr,
                                       spec2->numbered[j].number);
                        error_with_progname = true;

diff --git a/src/format-librep.c b/src/format-librep.c
index 03c5242ab49c06d2a51ace1e1ad6d7f610ef8799..97d2c9572fc1ea6f06256bd21746f836383e3d94 100644 (file)
--- a/src/format-librep.c
+++ b/src/format-librep.c
@@ -1,5 +1,5 @@
 /* librep format strings.
-   Copyright (C) 2001 Free Software Foundation, Inc.
+   Copyright (C) 2001-2002 Free Software Foundation, Inc.
    Written by Bruno Haible <haible@clisp.cons.org>, 2001.
 
    This program is free software; you can redistribute it and/or modify
@@ -310,7 +310,7 @@ format_check (pos, msgid_descr, msgstr_descr, equality, noisy, pretty_msgstr)
                {
                  error_with_progname = false;
                  error_at_line (0, 0, pos->file_name, pos->line_number,
-                                _("a format specification for argument {%u}, as in '%s', doesn't exist in 'msgid'"),
+                                _("a format specification for argument %u, as in '%s', doesn't exist in 'msgid'"),
                                 spec2->numbered[j].number, pretty_msgstr);
                  error_with_progname = true;
                }
@@ -325,7 +325,7 @@ format_check (pos, msgid_descr, msgstr_descr, equality, noisy, pretty_msgstr)
                    {
                      error_with_progname = false;
                      error_at_line (0, 0, pos->file_name, pos->line_number,
-                                    _("a format specification for argument {%u} doesn't exist in '%s'"),
+                                    _("a format specification for argument %u doesn't exist in '%s'"),
                                     spec1->numbered[i].number, pretty_msgstr);
                      error_with_progname = true;
                    }
@@ -350,7 +350,7 @@ format_check (pos, msgid_descr, msgstr_descr, equality, noisy, pretty_msgstr)
                      {
                        error_with_progname = false;
                        error_at_line (0, 0, pos->file_name, pos->line_number,
-                                      _("format specifications in 'msgid' and '%s' for argument {%u} are not the same"),
+                                      _("format specifications in 'msgid' and '%s' for argument %u are not the same"),
                                       pretty_msgstr,
                                       spec2->numbered[j].number);
                        error_with_progname = true;

diff --git a/src/format-pascal.c b/src/format-pascal.c
index 7372a11aaf6b1cab6e99683f821f5548b2c10bf0..12a33d198d5e4fbe67abed65990b727022afd8ac 100644 (file)
--- a/src/format-pascal.c
+++ b/src/format-pascal.c
@@ -1,5 +1,5 @@
 /* Object Pascal format strings.
-   Copyright (C) 2001 Free Software Foundation, Inc.
+   Copyright (C) 2001-2002 Free Software Foundation, Inc.
    Written by Bruno Haible <haible@clisp.cons.org>, 2001.
 
    This program is free software; you can redistribute it and/or modify
@@ -400,7 +400,7 @@ format_check (pos, msgid_descr, msgstr_descr, equality, noisy, pretty_msgstr)
                {
                  error_with_progname = false;
                  error_at_line (0, 0, pos->file_name, pos->line_number,
-                                _("a format specification for argument {%u}, as in '%s', doesn't exist in 'msgid'"),
+                                _("a format specification for argument %u, as in '%s', doesn't exist in 'msgid'"),
                                 spec2->numbered[j].number, pretty_msgstr);
                  error_with_progname = true;
                }
@@ -415,7 +415,7 @@ format_check (pos, msgid_descr, msgstr_descr, equality, noisy, pretty_msgstr)
                    {
                      error_with_progname = false;
                      error_at_line (0, 0, pos->file_name, pos->line_number,
-                                    _("a format specification for argument {%u} doesn't exist in '%s'"),
+                                    _("a format specification for argument %u doesn't exist in '%s'"),
                                     spec1->numbered[i].number, pretty_msgstr);
                      error_with_progname = true;
                    }
@@ -440,7 +440,7 @@ format_check (pos, msgid_descr, msgstr_descr, equality, noisy, pretty_msgstr)
                      {
                        error_with_progname = false;
                        error_at_line (0, 0, pos->file_name, pos->line_number,
-                                      _("format specifications in 'msgid' and '%s' for argument {%u} are not the same"),
+                                      _("format specifications in 'msgid' and '%s' for argument %u are not the same"),
                                       pretty_msgstr,
                                       spec2->numbered[j].number);
                        error_with_progname = true;