#include <config.h>
-#include <locale.h>
+#include <libpspp/i18n.h>
#include <assert.h>
#include <libintl.h>
#include <gsl/gsl_errno.h>
+#include <xalloc.h>
#include <argp.h>
#include <ui/command-line.h>
#include "relocatable.h"
#include "psppire-dict.h"
#include "psppire-var-store.h"
#include "psppire-data-store.h"
-#include "helper.h"
+#include "executor.h"
#include "message-dialog.h"
#include <ui/syntax-gen.h>
#define N_(msgid) msgid
-const char * output_file_name (void);
void
{
PsppireDict *dictionary = 0;
- /* gtk_init messes with the locale.
- So unset the bits we want to control ourselves */
- setlocale (LC_NUMERIC, "C");
-
- bindtextdomain (PACKAGE, locale_dir);
+ i18n_init ();
preregister_widgets ();
message_dialog_done ();
settings_done ();
outp_done ();
+ i18n_done ();
}
if ( local_is_utf8)
{
- utf8 = strdup (arg);
+ utf8 = xstrdup (arg);
}
else
{
g_free (utf8);
if ( filename == NULL)
- filename = strdup (arg);
+ filename = xstrdup (arg);
psppire_window_load (PSPPIRE_WINDOW (the_data_window), filename);