pspp-cvs
[Top][All Lists]
Advanced
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Pspp-cvs] pspp Smake po/de.po po/pspp.pot src/ui/gui/Chan...

From: John Darrington
Subject: [Pspp-cvs] pspp Smake po/de.po po/pspp.pot src/ui/gui/Chan...
Date: Sat, 17 Mar 2007 11:59:53 +0000 
CVSROOT:        /sources/pspp
Module name:    pspp
Changes by:     John Darrington <jmd>   07/03/17 11:59:53

Modified files:
        .              : Smake 
        po             : de.po pspp.pot 
        src/ui/gui     : ChangeLog var-sheet.c 
        tests/command  : missing-values.sh 

Log message:
        Changed call to nl_langinfo with localecharset (from gnulib).
        Fixed problem with test in non english locale.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/pspp/Smake?cvsroot=pspp&r1=1.50&r2=1.51
http://cvs.savannah.gnu.org/viewcvs/pspp/po/de.po?cvsroot=pspp&r1=1.38&r2=1.39
http://cvs.savannah.gnu.org/viewcvs/pspp/po/pspp.pot?cvsroot=pspp&r1=1.122&r2=1.123
http://cvs.savannah.gnu.org/viewcvs/pspp/src/ui/gui/ChangeLog?cvsroot=pspp&r1=1.42&r2=1.43
http://cvs.savannah.gnu.org/viewcvs/pspp/src/ui/gui/var-sheet.c?cvsroot=pspp&r1=1.20&r2=1.21
http://cvs.savannah.gnu.org/viewcvs/pspp/tests/command/missing-values.sh?cvsroot=pspp&r1=1.5&r2=1.6

Patches:
Index: Smake
===================================================================
RCS file: /sources/pspp/pspp/Smake,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -b -r1.50 -r1.51
--- Smake       10 Mar 2007 22:56:39 -0000      1.50
+++ Smake       17 Mar 2007 11:59:53 -0000      1.51
@@ -24,6 +24,7 @@
        inttostr \
        linebreak \
        localcharset \
+       minmax \
         mbchar \
        memcasecmp \
        memchr \
@@ -128,6 +129,7 @@
        rm -f mdate-sh texinfo.tex
        rm -f doc/stamp-vti
        rm -f config.h.in~
+       rm -f config.h.in
        find . -name Makefile.in -exec rm -f {} \; 
        rm -f compile
        rm -f ltmain.sh

Index: po/de.po
===================================================================
RCS file: /sources/pspp/pspp/po/de.po,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -b -r1.38 -r1.39
--- po/de.po    1 Mar 2007 21:26:28 -0000       1.38
+++ po/de.po    17 Mar 2007 11:59:53 -0000      1.39
@@ -10,7 +10,7 @@
 msgstr ""
 "Project-Id-Version: PSPP 0.4.2\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2007-02-24 09:40-0800\n"
+"POT-Creation-Date: 2007-03-07 16:39+0100\n"
 "PO-Revision-Date: 2006-05-26 17:49+0800\n"
 "Last-Translator: John Darrington <address@hidden>\n"
 "Language-Team: German <address@hidden>\n"
@@ -1045,7 +1045,7 @@
 msgstr ""
 
 #: src/language/data-io/data-list.c:418 src/language/data-io/print.c:398
-#: src/ui/gui/var-sheet.c:76
+#: src/ui/gui/var-sheet.c:74
 msgid "Columns"
 msgstr "Spalten"
 
@@ -1584,7 +1584,7 @@
 
 #: src/language/dictionary/split-file.c:87
 #: src/language/dictionary/sys-file-info.c:402
-#: src/language/dictionary/sys-file-info.c:550 src/ui/gui/var-sheet.c:73
+#: src/language/dictionary/sys-file-info.c:550 src/ui/gui/var-sheet.c:71
 msgid "Label"
 msgstr "Kennsatz"
 
@@ -2399,7 +2399,7 @@
 
 #: src/language/stats/crosstabs.q:824 src/language/stats/examine.q:908
 #: src/language/stats/frequencies.q:1213 src/language/stats/frequencies.q:1520
-#: src/ui/gui/var-sheet.c:75
+#: src/ui/gui/var-sheet.c:73
 msgid "Missing"
 msgstr "Löse"
 
@@ -2502,7 +2502,7 @@
 msgid "Directional measures."
 msgstr ""
 
-#: src/language/stats/crosstabs.q:1186 src/ui/gui/var-sheet.c:70
+#: src/language/stats/crosstabs.q:1186 src/ui/gui/var-sheet.c:68
 msgid "Type"
 msgstr "Typ"
 
@@ -4711,51 +4711,51 @@
 msgid "To End"
 msgstr ""
 
-#: src/ui/gui/var-sheet.c:69
+#: src/ui/gui/var-sheet.c:67
 msgid "Name"
 msgstr "Name"
 
-#: src/ui/gui/var-sheet.c:71
+#: src/ui/gui/var-sheet.c:69
 msgid "Width"
 msgstr "Große"
 
-#: src/ui/gui/var-sheet.c:72
+#: src/ui/gui/var-sheet.c:70
 msgid "Decimals"
 msgstr "Dezimalstellen"
 
-#: src/ui/gui/var-sheet.c:74
+#: src/ui/gui/var-sheet.c:72
 msgid "Values"
 msgstr "Werten"
 
-#: src/ui/gui/var-sheet.c:77
+#: src/ui/gui/var-sheet.c:75
 msgid "Align"
 msgstr "Einstellung"
 
-#: src/ui/gui/var-sheet.c:78
+#: src/ui/gui/var-sheet.c:76
 msgid "Measure"
 msgstr "Messe"
 
-#: src/ui/gui/var-sheet.c:84
+#: src/ui/gui/var-sheet.c:82
 msgid "Left"
 msgstr "Links"
 
-#: src/ui/gui/var-sheet.c:85
+#: src/ui/gui/var-sheet.c:83
 msgid "Right"
 msgstr "Rechts"
 
-#: src/ui/gui/var-sheet.c:86
+#: src/ui/gui/var-sheet.c:84
 msgid "Centre"
 msgstr "Mittel"
 
-#: src/ui/gui/var-sheet.c:91
+#: src/ui/gui/var-sheet.c:89
 msgid "Nominal"
 msgstr "Nominalwert"
 
-#: src/ui/gui/var-sheet.c:92
+#: src/ui/gui/var-sheet.c:90
 msgid "Ordinal"
 msgstr "Ordinalwert"
 
-#: src/ui/gui/var-sheet.c:93
+#: src/ui/gui/var-sheet.c:91
 msgid "Scale"
 msgstr "Skalwert"
 
@@ -4832,7 +4832,7 @@
 "Report bugs to <%s>.\n"
 msgstr ""
 
-#: src/ui/terminal/main.c:128
+#: src/ui/terminal/main.c:132
 msgid ""
 "Stopping syntax file processing here to avoid a cascade of dependent command "
 "failures."

Index: po/pspp.pot
===================================================================
RCS file: /sources/pspp/pspp/po/pspp.pot,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -b -r1.122 -r1.123
--- po/pspp.pot 1 Mar 2007 21:26:28 -0000       1.122
+++ po/pspp.pot 17 Mar 2007 11:59:53 -0000      1.123
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2007-02-24 09:40-0800\n"
+"POT-Creation-Date: 2007-03-07 16:39+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <address@hidden>\n"
 "Language-Team: LANGUAGE <address@hidden>\n"
@@ -1040,7 +1040,7 @@
 msgstr ""
 
 #: src/language/data-io/data-list.c:418 src/language/data-io/print.c:398
-#: src/ui/gui/var-sheet.c:76
+#: src/ui/gui/var-sheet.c:74
 msgid "Columns"
 msgstr ""
 
@@ -1579,7 +1579,7 @@
 
 #: src/language/dictionary/split-file.c:87
 #: src/language/dictionary/sys-file-info.c:402
-#: src/language/dictionary/sys-file-info.c:550 src/ui/gui/var-sheet.c:73
+#: src/language/dictionary/sys-file-info.c:550 src/ui/gui/var-sheet.c:71
 msgid "Label"
 msgstr ""
 
@@ -2394,7 +2394,7 @@
 
 #: src/language/stats/crosstabs.q:824 src/language/stats/examine.q:908
 #: src/language/stats/frequencies.q:1213 src/language/stats/frequencies.q:1520
-#: src/ui/gui/var-sheet.c:75
+#: src/ui/gui/var-sheet.c:73
 msgid "Missing"
 msgstr ""
 
@@ -2497,7 +2497,7 @@
 msgid "Directional measures."
 msgstr ""
 
-#: src/language/stats/crosstabs.q:1186 src/ui/gui/var-sheet.c:70
+#: src/language/stats/crosstabs.q:1186 src/ui/gui/var-sheet.c:68
 msgid "Type"
 msgstr ""
 
@@ -4681,51 +4681,51 @@
 msgid "To End"
 msgstr ""
 
-#: src/ui/gui/var-sheet.c:69
+#: src/ui/gui/var-sheet.c:67
 msgid "Name"
 msgstr ""
 
-#: src/ui/gui/var-sheet.c:71
+#: src/ui/gui/var-sheet.c:69
 msgid "Width"
 msgstr ""
 
-#: src/ui/gui/var-sheet.c:72
+#: src/ui/gui/var-sheet.c:70
 msgid "Decimals"
 msgstr ""
 
-#: src/ui/gui/var-sheet.c:74
+#: src/ui/gui/var-sheet.c:72
 msgid "Values"
 msgstr ""
 
-#: src/ui/gui/var-sheet.c:77
+#: src/ui/gui/var-sheet.c:75
 msgid "Align"
 msgstr ""
 
-#: src/ui/gui/var-sheet.c:78
+#: src/ui/gui/var-sheet.c:76
 msgid "Measure"
 msgstr ""
 
-#: src/ui/gui/var-sheet.c:84
+#: src/ui/gui/var-sheet.c:82
 msgid "Left"
 msgstr ""
 
-#: src/ui/gui/var-sheet.c:85
+#: src/ui/gui/var-sheet.c:83
 msgid "Right"
 msgstr ""
 
-#: src/ui/gui/var-sheet.c:86
+#: src/ui/gui/var-sheet.c:84
 msgid "Centre"
 msgstr ""
 
-#: src/ui/gui/var-sheet.c:91
+#: src/ui/gui/var-sheet.c:89
 msgid "Nominal"
 msgstr ""
 
-#: src/ui/gui/var-sheet.c:92
+#: src/ui/gui/var-sheet.c:90
 msgid "Ordinal"
 msgstr ""
 
-#: src/ui/gui/var-sheet.c:93
+#: src/ui/gui/var-sheet.c:91
 msgid "Scale"
 msgstr ""
 
@@ -4802,7 +4802,7 @@
 "Report bugs to <%s>.\n"
 msgstr ""
 
-#: src/ui/terminal/main.c:128
+#: src/ui/terminal/main.c:132
 msgid ""
 "Stopping syntax file processing here to avoid a cascade of dependent command "
 "failures."

Index: src/ui/gui/ChangeLog
===================================================================
RCS file: /sources/pspp/pspp/src/ui/gui/ChangeLog,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -b -r1.42 -r1.43
--- src/ui/gui/ChangeLog        22 Feb 2007 11:26:37 -0000      1.42
+++ src/ui/gui/ChangeLog        17 Mar 2007 11:59:53 -0000      1.43
@@ -1,3 +1,8 @@
+Wed Mar  7 19:05:12 CET 2007 John Darrington <address@hidden>
+
+       * var-sheet.c: Replaced call to nl_langinfo with locale_charset 
+       from gnulib.
+
 Thu Feb 22 12:27:41 CET 2007 John Darrington <address@hidden>
 
        * data-editor.c : called new gen_quoted_string function to properly 

Index: src/ui/gui/var-sheet.c
===================================================================
RCS file: /sources/pspp/pspp/src/ui/gui/var-sheet.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- src/ui/gui/var-sheet.c      21 Feb 2007 08:27:16 -0000      1.20
+++ src/ui/gui/var-sheet.c      17 Mar 2007 11:59:53 -0000      1.21
@@ -33,9 +33,6 @@
 
 #include <stdlib.h>
 #include <string.h>
-#if HAVE_LANGINFO_H
-#include <langinfo.h>
-#endif
 
 #include <data/value.h>
 
@@ -43,6 +40,7 @@
 #include <gtksheet/gsheet-hetero-column.h>
 #include <gtksheet/gsheet-uniform-row.h>
 
+#include "localcharset.h"
 #include "psppire-var-store.h"
 #include "helper.h"
 #include "psppire-dict.h"
@@ -446,12 +444,11 @@
   gtk_sheet_set_model (GTK_SHEET (sheet), G_SHEET_MODEL (the_var_store));
 
 
-#if HAVE_LANGINFO_H
   /* Since this happens inside glade_xml_new, we must prevent strings from
    * being re-encoded twice */
   codeset = bind_textdomain_codeset (PACKAGE, 0);
-  bind_textdomain_codeset (PACKAGE, nl_langinfo (CODESET));
-#endif
+  bind_textdomain_codeset (PACKAGE, locale_charset ());
+
   for (i = 0 ; i < n_COLS ; ++i )
     {
       g_sheet_hetero_column_set_button_label (G_SHEET_HETERO_COLUMN (geo), i,
@@ -460,9 +457,8 @@
       g_sheet_hetero_column_set_width (G_SHEET_HETERO_COLUMN (geo), i,
                                               column_def[i].width);
     }
-#if HAVE_LANGINFO_H
+
   bind_textdomain_codeset (PACKAGE, codeset);
-#endif
 
   gtk_widget_show (sheet);
 

Index: tests/command/missing-values.sh
===================================================================
RCS file: /sources/pspp/pspp/tests/command/missing-values.sh,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- tests/command/missing-values.sh     7 Nov 2006 13:00:00 -0000       1.5
+++ tests/command/missing-values.sh     17 Mar 2007 11:59:53 -0000      1.6
@@ -17,6 +17,8 @@
 STAT_CONFIG_PATH=$top_srcdir/config
 export STAT_CONFIG_PATH
 
+LANG=C
+export LANG
 
 cleanup()
 {
reply via email to
[Prev in Thread] Current Thread [Next in Thread]