Add args.h to POTFILES.in and change the interface to ExitArgError() so msg is c...

Having msg as a format string will ease translations because then
badArg doesn't have to come last.

diff --git a/args.h b/args.h
index 4848269..6737499 100644 (file)
--- a/args.h
+++ b/args.h
@@ -773,7 +773,7 @@ ExitArgError(char *msg, char *badArg, Boolean quit)
   char buf[MSG_SIZ];
   int len;
 
-  len = snprintf(buf,MSG_SIZ, "%s %s", msg, badArg);
+  len = snprintf(buf, MSG_SIZ, msg, badArg);
   if( (len >= MSG_SIZ) && appData.debugMode )
     fprintf(debugFP, "ExitArgError: buffer truncated. Input: msg=%s badArg=%s\n", msg, badArg);
 
@@ -787,7 +787,7 @@ ValidateInt(char *s)
 {
   char *p = s;
   if(*p == '-' || *p == '+') p++;
-  while(*p) if(!isdigit(*p++)) ExitArgError(_("Bad integer value"), s, TRUE);
+  while(*p) if(!isdigit(*p++)) ExitArgError(_("Bad integer value %s"), s, TRUE);
   return atoi(s);
 }
 
@@ -878,7 +878,7 @@ ParseArgs(GetFunc get, void *cl)
       for (ad = argDescriptors; ad->argName != NULL; ad++)
        if (strcmp(ad->argName, argName + 1) == 0) break;
       if (ad->argName == NULL) {
-       ExitArgError(_("Unrecognized argument"), argName, get != &FileGet); // [HGM] make unknown argument non-fatal
+       ExitArgError(_("Unrecognized argument %s"), argName, get != &FileGet); // [HGM] make unknown argument non-fatal
        while (ch != '\n' && ch != NULLCHAR) ch = get(cl); // but skip rest of line it is on
        continue; // so that when it is in a settings file, it is the only setting that will be purged from it
       }
@@ -907,7 +907,7 @@ ParseArgs(GetFunc get, void *cl)
 
     while (ch == ' ' || ch == '=' || ch == ':' || ch == '\t') ch = get(cl);
     if (ch == NULLCHAR || ch == '\n') {
-      ExitArgError(_("No value provided for argument"), argName, TRUE);
+      ExitArgError(_("No value provided for argument %s"), argName, TRUE);
     }
     q = argValue;
     if (ch == '{') {
@@ -967,7 +967,7 @@ ParseArgs(GetFunc get, void *cl)
          ch = get(cl);
          switch (ch) {
          case NULLCHAR:
-           ExitArgError(_("Incomplete \\ escape in value for"), argName, TRUE);
+           ExitArgError(_("Incomplete \\ escape in value for %s"), argName, TRUE);
            break;
          case 'n':
            *q++ = '\n';
@@ -1051,7 +1051,7 @@ ParseArgs(GetFunc get, void *cl)
        } else {
          if (ad->argLoc != NULL) {
          } else {
-           ExitArgError(_("Failed to open indirection file"), argValue, TRUE);
+           ExitArgError(_("Failed to open indirection file %s"), argValue, TRUE);
          }
        }
       }
@@ -1068,7 +1068,7 @@ ParseArgs(GetFunc get, void *cl)
        *(Boolean *) ad->argLoc = FALSE;
        break;
       default:
-       ExitArgError(_("Unrecognized boolean argument value"), argValue, TRUE);
+       ExitArgError(_("Unrecognized boolean argument value %s"), argValue, TRUE);
        break;
       }
       break;
@@ -1096,7 +1096,7 @@ ParseArgs(GetFunc get, void *cl)
       break;
 
     case ArgNone:
-      ExitArgError(_("Unrecognized argument"), argValue, TRUE);
+      ExitArgError(_("Unrecognized argument %s"), argValue, TRUE);
       break;
     case ArgTwo:
     case ArgTrue:

diff --git a/po/POTFILES.in b/po/POTFILES.in
index 1b31d76..b5b4b2a 100755 (executable)
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -10,3 +10,4 @@ xevalgraph.c
 xgamelist.c
 xhistory.c
 xoptions.c
+args.h