Fixed some issues with internationalisation

[pspp] / src / cmdline.c

diff --git a/src/cmdline.c b/src/cmdline.c
index bb9b9bab40aa28f25b76163c633737b031fac8fd..ac33ee4aaa7ee43e451efca6ca36e35551c1ae0b 100644 (file)
--- a/src/cmdline.c
+++ b/src/cmdline.c
@@ -18,6 +18,7 @@
    02111-1307, USA. */
 
 #include <config.h>
+#include "cmdline.h"
 #include <assert.h>
 #include <ctype.h>
 #include <stdio.h>
@@ -108,7 +109,8 @@ parse_command_line (int argc, char **argv)
          config_path = optarg;
          break;
        case 'f':
-         printf (_("-f not yet implemented\n"));
+         printf(_("%s is not yet implemented."), "-f");
+          putchar('\n');
          break;
        case 'h':
          usage ();
@@ -126,7 +128,8 @@ parse_command_line (int argc, char **argv)
          outp_list_classes ();
          err_hcf (1);
        case 'n':
-         printf (_("-n not yet implemented\n"));
+         printf (_("%s is not yet implemented."),"-n");
+          putchar('\n');
          break;
        case 'o':
          if (!cleared_device_defaults)
@@ -137,7 +140,8 @@ parse_command_line (int argc, char **argv)
          outp_configure_add (optarg);
          break;
        case 'p':
-         printf (_("-p not yet implemented\n"));
+         printf (_("%s is not yet implemented."),"-p");
+          putchar('\n');
          break;
        case 'r':
          no_statrc = 1;
@@ -171,7 +175,7 @@ parse_command_line (int argc, char **argv)
   if (set_testing_mode)
     {
       /* FIXME: Later this option should do some other things, too. */
-      set_viewwidth = 79;
+      set_viewwidth = 9999;
     }
 
   for (i = optind; i < argc; i++)
@@ -242,8 +246,7 @@ N_("PSPP, a program for statistical analysis of sample data.\n"
 "\n");
 
 /* Message that describes PSPP command-line syntax, continued. */
-static const char post_syntax_message[] = 
-N_("\nReport bugs to <bug-gnu-pspp@gnu.org>.\n");
+static const char post_syntax_message[] = N_("\nReport bugs to <%s>.\n");
 
 /* Writes a syntax description to stdout and terminates. */
 static void
@@ -251,7 +254,7 @@ usage (void)
 {
   printf (gettext (pre_syntax_message), pgmname);
   outp_list_classes ();
-  printf (gettext (post_syntax_message));
+  printf (gettext (post_syntax_message),PACKAGE_BUGREPORT);
 
   err_hcf (1);
 }