X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=src%2Fui%2Fterminal%2Fmain.c;h=7ad162fca6d40b746a0155d891d8e08784e2e4df;hb=bd17d2af982332ee1791998361b1ac6731fe14fa;hp=e37cace39ec05af2527c6e23493689b46e75d75b;hpb=deb4fd96c0c171fc8eb64f7f1e7f5c2af4931416;p=pspp

diff --git a/src/ui/terminal/main.c b/src/ui/terminal/main.c
index e37cace39e..7ad162fca6 100644
--- a/src/ui/terminal/main.c
+++ b/src/ui/terminal/main.c
@@ -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);
 
@@ -119,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);
@@ -166,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)
@@ -234,5 +221,6 @@ clean_up (void)
       readln_uninitialize ();
       outp_done ();
       msg_ui_done ();
+      i18n_done ();
     }
 }