From: John Darrington <john@darrington.wattle.id.au>
Date: Sun, 23 Dec 2012 16:05:40 +0000 (+0100)
Subject: Logistic Regression GUI: make locale independent.
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d50402a72ca10ec20c202d5600cb5a362d08d0ce;p=pspp

Logistic Regression GUI: make locale independent.

The syntax generator for the logistic regression dialog generated commas instead of dots
under some locales.  This change fixes that.
---

diff --git a/src/ui/gui/psppire-dialog-action-logistic.c b/src/ui/gui/psppire-dialog-action-logistic.c
index 0426931e85..85137868c6 100644
--- a/src/ui/gui/psppire-dialog-action-logistic.c
+++ b/src/ui/gui/psppire-dialog-action-logistic.c
@@ -153,37 +153,38 @@ generate_syntax (PsppireDialogAction *a)
 {
   PsppireDialogActionLogistic *rd = PSPPIRE_DIALOG_ACTION_LOGISTIC (a);
   gchar *text = NULL;
+  struct string str;
+  const gchar *dep = gtk_entry_get_text (GTK_ENTRY (rd->dep_var));
 
-  GString *string = g_string_new ("LOGISTIC REGRESSION ");
+  ds_init_cstr (&str, "LOGISTIC REGRESSION ");
 
-  const gchar *dep = gtk_entry_get_text (GTK_ENTRY (rd->dep_var));
+  ds_put_cstr (&str, dep);
 
-  g_string_append (string, dep);
+  ds_put_cstr (&str, " WITH ");
 
-  g_string_append (string, " WITH ");
+  psppire_var_view_append_names_str (PSPPIRE_VAR_VIEW (rd->indep_vars), 0, &str);
 
-  psppire_var_view_append_names (PSPPIRE_VAR_VIEW (rd->indep_vars), 0, string);
+  ds_put_cstr (&str, "\n\t/CRITERIA =");
 
-  g_string_append (string, "\n\t/CRITERIA =");
+  syntax_gen_pspp (&str, " CUT(%g)", rd->cut_point);
 
-  g_string_append_printf (string, " CUT(%g)", rd->cut_point);
-  g_string_append_printf (string, " ITERATE(%d)", rd->max_iterations);
+  syntax_gen_pspp (&str, " ITERATE(%d)", rd->max_iterations);
 
   if (rd->conf)
     {
-      g_string_append_printf (string, "\n\t/PRINT = CI(%g)", rd->conf_level);
+      syntax_gen_pspp (&str, "\n\t/PRINT = CI(%g)", rd->conf_level);
     }
 
   if (rd->constant) 
-    g_string_append (string, "\n\t/NOORIGIN");
+    ds_put_cstr (&str, "\n\t/NOORIGIN");
   else
-    g_string_append (string, "\n\t/ORIGIN");
+    ds_put_cstr (&str, "\n\t/ORIGIN");
 
-  g_string_append (string, ".\n");
+  ds_put_cstr (&str, ".\n");
 
-  text = string->str;
+  text = ds_steal_cstr (&str);
 
-  g_string_free (string, FALSE);
+  ds_destroy (&str);
 
   return text;
 }