lexer: Reimplement for better testability and internationalization.

[pspp-builds.git] / src / ui / gui / psppire-var-store.c

diff --git a/src/ui/gui/psppire-var-store.c b/src/ui/gui/psppire-var-store.c
index 1a2fc1fcee1429d5e83d68f35204b88fca68bef2..2a915afe149d6288a8af80c2ff201712ee63058a 100644 (file)
--- a/src/ui/gui/psppire-var-store.c
+++ b/src/ui/gui/psppire-var-store.c
@@ -1,5 +1,5 @@
 /* PSPPIRE - a graphical user interface for PSPP.
-   Copyright (C) 2006, 2009, 2010  Free Software Foundation
+   Copyright (C) 2006, 2009, 2010, 2011  Free Software Foundation
 
    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
@@ -279,7 +279,7 @@ static void
 psppire_var_store_init (PsppireVarStore *var_store)
 {
   if ( ! gdk_color_parse (DISABLED_COLOR, &var_store->disabled))
-       g_critical ("Could not parse color \"%s\"", DISABLED_COLOR);
+       g_critical ("Could not parse color `%s'", DISABLED_COLOR);
 
   var_store->dictionary = NULL;
   var_store->format_type = PSPPIRE_VAR_STORE_OUTPUT_FORMATS;
@@ -489,7 +489,7 @@ psppire_var_store_clear (PsppireSheetModel *model,  glong row, glong col)
   switch (col)
     {
     case PSPPIRE_VAR_STORE_COL_LABEL:
-      var_set_label (pv, NULL);
+      var_clear_label (pv);
       return TRUE;
       break;
     }
@@ -588,7 +588,8 @@ psppire_var_store_set_string (PsppireSheetModel *model,
       break;
     case PSPPIRE_VAR_STORE_COL_LABEL:
       {
-       var_set_label (pv, text);
+       var_set_label (pv, text,
+                       psppire_dict_encoding (var_store->dictionary), true);
        return TRUE;
       }
       break;
@@ -685,7 +686,7 @@ text_for_column (PsppireVarStore *vs,
          default:
             {
               char str[FMT_STRING_LEN_MAX + 1];
-              g_warning ("Unknown format: \"%s\"\n",
+              g_warning ("Unknown format: `%s'\n",
                         fmt_to_string (write_spec, str));
             }
            break;
@@ -752,7 +753,7 @@ text_for_column (PsppireVarStore *vs,
            {
              gchar *const vstr = value_to_text (vl->value, dict, *write_spec);
 
-             return g_strdup_printf ( "{%s,\"%s\"}_", vstr, val_lab_get_label (vl));
+             return g_strdup_printf (_("{%s,`%s'}_"), vstr, val_lab_get_label (vl));
            }
          }
       }