New msgfmt option --check-accelerators.

diff --git a/doc/ChangeLog b/doc/ChangeLog
index 1112546119f6ff5f717bf978f21c461f6ee226e9..6cb40af371164f218daea4891f8139a95dfe4157 100644 (file)
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,7 @@
+2001-11-11  Bruno Haible  <haible@clisp.cons.org>
+
+       * msgfmt.texi: Document --check-accelerators option.
+
 2001-11-11  Bruno Haible  <haible@clisp.cons.org>
 
        * msginit.texi: Remove --verbose documentation.

diff --git a/doc/msgfmt.texi b/doc/msgfmt.texi
index dc30e45c2679f626b96d4212bee00b5444dfba25..526b957bb13c55010b815333ee9574a26c46ba38 100644 (file)
--- a/doc/msgfmt.texi
+++ b/doc/msgfmt.texi
@@ -119,6 +119,14 @@ option
 Check that GNU msgfmt behaves like X/Open msgfmt.  This will give an error
 when attempting to use the GNU extensions.
 
+@item --check-accelerators
+Check presence of keyboard accelerators for menu items.  This is based on
+the convention used in some GUIs that a keyboard accelerator in a menu
+item string is designated by an immediately preceding @samp{&} character.
+Sometimes a keyboard accelerator is also called "keyboard mnemonic".
+This check verifies that if the untranslated string has exactly one
+@samp{&} character, the translated string has exactly one @samp{&} as well.
+
 @item -f
 @itemx --use-fuzzy
 Use fuzzy entries in output.  Note that using this option is usually wrong,

diff --git a/src/ChangeLog b/src/ChangeLog
index 58e9e8e034c58323cd84e190876ccac73c91fe67..21cb65b72434df6b09fbacf3a0b6f6485e75e6ca 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,11 @@
+2001-11-11  Bruno Haible  <haible@clisp.cons.org>
+
+       * msgfmt.c (check_accelerators): New variable.
+       (long_options): Add --check-accelerators.
+       (main): Handle --check-accelerators.
+       (usage): Document --check-accelerators option.
+       (check_pair): Implement check_accelerators handling.
+
 2001-11-11  Bruno Haible  <haible@clisp.cons.org>
 
        * msgl-cat.c (catenate_msgdomain_list): Fix a typo in 2001-11-01 patch.

diff --git a/src/msgfmt.c b/src/msgfmt.c
index fdedeca4a8c070fdaf40e96b8aa4d34f596ea924..71016668bf16411ac3f285e98adcd418c0f1e712 100644 (file)
--- a/src/msgfmt.c
+++ b/src/msgfmt.c
@@ -28,6 +28,7 @@
 #include <signal.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 #include <locale.h>
 
 #include "dir-list.h"
@@ -124,6 +125,11 @@ static bool check_domain = false;
    X/Open msgfmt or XView msgfmt.  */
 static bool check_compatibility = false;
 
+/* If true, consider that strings containing an '&' are menu items and
+   the '&' designates a keyboard accelerator, and verify that the translations
+   also have a keyboard accelerator.  */
+static bool check_accelerators = false;
+
 /* Counters for statistics on translations for the processed files.  */
 static int msgs_translated;
 static int msgs_untranslated;
@@ -137,16 +143,17 @@ static const struct option long_options[] =
 {
   { "alignment", required_argument, NULL, 'a' },
   { "check", no_argument, NULL, 'c' },
+  { "check-accelerators", no_argument, NULL, CHAR_MAX + 1 },
   { "check-compatibility", no_argument, NULL, 'C' },
-  { "check-domain", no_argument, NULL, CHAR_MAX + 1 },
-  { "check-format", no_argument, NULL, CHAR_MAX + 2 },
-  { "check-header", no_argument, NULL, CHAR_MAX + 3 },
+  { "check-domain", no_argument, NULL, CHAR_MAX + 2 },
+  { "check-format", no_argument, NULL, CHAR_MAX + 3 },
+  { "check-header", no_argument, NULL, CHAR_MAX + 4 },
   { "directory", required_argument, NULL, 'D' },
   { "help", no_argument, NULL, 'h' },
   { "java", no_argument, NULL, 'j' },
-  { "java2", no_argument, NULL, CHAR_MAX + 4 },
+  { "java2", no_argument, NULL, CHAR_MAX + 5 },
   { "locale", required_argument, NULL, 'l' },
-  { "no-hash", no_argument, NULL, CHAR_MAX + 5 },
+  { "no-hash", no_argument, NULL, CHAR_MAX + 6 },
   { "output-file", required_argument, NULL, 'o' },
   { "resource", required_argument, NULL, 'r' },
   { "statistics", no_argument, &do_statistics, 1 },
@@ -284,19 +291,22 @@ main (argc, argv)
        do_version = true;
        break;
       case CHAR_MAX + 1:
-       check_domain = true;
+       check_accelerators = true;
        break;
       case CHAR_MAX + 2:
-       check_format_strings = true;
+       check_domain = true;
        break;
       case CHAR_MAX + 3:
-       check_header = true;
+       check_format_strings = true;
        break;
       case CHAR_MAX + 4:
+       check_header = true;
+       break;
+      case CHAR_MAX + 5:
        java_mode = true;
        assume_java2 = true;
        break;
-      case CHAR_MAX + 5:
+      case CHAR_MAX + 6:
        no_hash_table = true;
        break;
       default:
@@ -515,6 +525,8 @@ Input file interpretation:\n\
       --check-domain          check for conflicts between domain directives\n\
                                 and the --output-file option\n\
   -C, --check-compatibility   check that GNU msgfmt behaves like X/Open msgfmt\n\
+      --check-accelerators    check presence of keyboard accelerators for\n\
+                                menu items\n\
   -f, --use-fuzzy             use fuzzy entries in output\n\
 "));
       printf ("\n");
@@ -1063,6 +1075,42 @@ check_pair (msgid, msgid_pos, msgid_plural, msgstr, msgstr_len, msgstr_pos,
              parser->free (msgid_descr);
            }
        }
+
+  if (check_accelerators && msgid_plural == NULL)
+    /* Test 4: Check that if msgid is a menu item with a keyboard accelerator,
+       the msgstr has an accelerator as well.  A keyboard accelerator is
+       designated by an immediately preceding '&'.  We cannot check whether
+       two accelerators collide, only whether the translator has bothered
+       thinking about them.  */
+    {
+      const char *p;
+
+      /* We are only interested in msgids that contain exactly one '&'.  */
+      p = strchr (msgid, '&');
+      if (p != NULL && strchr (p + 1, '&') == NULL)
+       {
+         /* Count the number of '&' in msgstr.  */
+         unsigned int count = 0;
+
+         for (p = msgstr; (p = strchr (p, '&')) != NULL; p++)
+           count++;
+
+         if (count == 0)
+           {
+             error_with_progname = false;
+             error_at_line (0, 0, msgid_pos->file_name, msgid_pos->line_number,
+                            _("msgstr lacks the keyboard accelerator mark '&'"));
+             error_with_progname = true;
+           }
+         else if (count > 1)
+           {
+             error_with_progname = false;
+             error_at_line (0, 0, msgid_pos->file_name, msgid_pos->line_number,
+                            _("msgstr has too many keyboard accelerator marks '&'"));
+             error_with_progname = true;
+           }
+       }
+    }
 }