X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fterminal%2Fmain.c;h=7ad162fca6d40b746a0155d891d8e08784e2e4df;hb=30f2130261c2b4bdd9dbf95aa7c5cbbdaef4c014;hp=904c9a1dbc772bb1bcbf33d591124da8a41db9b6;hpb=fe76b9c2c49a0dd33aad5dfe3f03a056e6f96c21;p=pspp-builds.git

diff --git a/src/ui/terminal/main.c b/src/ui/terminal/main.c
index 904c9a1d..7ad162fc 100644
--- a/src/ui/terminal/main.c
+++ b/src/ui/terminal/main.c
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 1997-9, 2000, 2006, 2007 Free Software Foundation, Inc.
+   Copyright (C) 1997-9, 2000, 2006, 2007, 2009 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -16,7 +16,6 @@
 
 #include <config.h>
 
-#include <locale.h>
 #include <signal.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -30,6 +29,8 @@
 #include <ieeefp.h>
 #endif
 
+
+#include <libpspp/i18n.h>
 #include <data/dictionary.h>
 #include <data/file-handle-def.h>
 #include <libpspp/getl.h>
@@ -56,12 +57,12 @@
 
 #include "fatal-signal.h"
 #include "progname.h"
+#include "relocatable.h"
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
 
 
-static void i18n_init (void);
 static void fpu_init (void);
 static void clean_up (void);
 
@@ -89,7 +90,6 @@ main (int argc, char **argv)
   signal (SIGABRT, bug_handler);
   signal (SIGSEGV, bug_handler);
   signal (SIGFPE, bug_handler);
-  signal (SIGALRM, SIG_IGN);
   at_fatal_signal (clean_up);
 
   i18n_init ();
@@ -120,7 +120,7 @@ main (int argc, char **argv)
 				      _("Options affecting input and output locations:"), the_source_stream);
 
   command_line_processor_add_options (clp, &test_argp,
-				      _("Diagnositic options:"), the_source_stream);
+				      _("Diagnostic options:"), the_source_stream);
 
   command_line_processor_add_options (clp, &post_init_argp,
 				      _("Options affecting syntax and behavior:"), the_source_stream);
@@ -167,20 +167,6 @@ main (int argc, char **argv)
   return any_errors ();
 }
 
-static void
-i18n_init (void)
-{
-#if ENABLE_NLS
-#if HAVE_LC_MESSAGES
-  setlocale (LC_MESSAGES, "");
-#endif
-#if HAVE_LC_PAPER
-  setlocale (LC_PAPER, "");
-#endif
-  bindtextdomain (PACKAGE, locale_dir);
-  textdomain (PACKAGE);
-#endif /* ENABLE_NLS */
-}
 
 static void
 fpu_init (void)
@@ -235,5 +221,6 @@ clean_up (void)
       readln_uninitialize ();
       outp_done ();
       msg_ui_done ();
+      i18n_done ();
     }
 }