From: Andrea Zagli Date: Sat, 22 Oct 2011 09:02:13 +0000 (+0200) Subject: Gettextized (closes #138). X-Git-Tag: 0.5.0~24^2 X-Git-Url: https://saetta.ns0.it/gitweb?a=commitdiff_plain;h=2d50d519b5872a6bc2777c7d5789152e7160772e;p=libgdaex Gettextized (closes #138). --- diff --git a/.anjuta/default.profile b/.anjuta/default.profile new file mode 100644 index 0000000..cf999f6 --- /dev/null +++ b/.anjuta/default.profile @@ -0,0 +1,18 @@ + + + + + + + + + + + + diff --git a/.anjuta/session/anjuta.session b/.anjuta/session/anjuta.session new file mode 100644 index 0000000..300bb0f --- /dev/null +++ b/.anjuta/session/anjuta.session @@ -0,0 +1,29 @@ + +[Anjuta] +Maximized=1 +Geometry=1366x716+0+30 + +[Project Manager] +Shortcut=libgdaex//libgdaex//src//libgdaex.la%%%libgdaex//libgdaex//tests//test_prefix%%%libgdaex//libgdaex//tests//grid%%%libgdaex//libgdaex//tests//query_editor +Expand=libgdaex + +[File Loader] +Files=file:///home/andreaz/files/c/libgdaex/src/queryeditor.c#15 + +[Document Manager] +bookmarks=\n\n + +[Execution] +Run in terminal=2 +Working directories=file:///home/andreaz/files/c/libgdaex + +[Build] +Configuration list=1:Default:%%%1:Debug:Debug%%%1:Profiling:Profiling%%%1:Optimized:Optimized +Selected Configuration=Default +BuildArgs/Default=--enable-maintainer-mode +BuildArgs/Debug=--enable-maintainer-mode 'CFLAGS=-g -O0' 'CXXFLAGS=-g -O0' 'JFLAGS=-g -O0' 'FFLAGS=-g -O0' +BuildArgs/Profiling=--enable-maintainer-mode 'CFLAGS=-g -pg' 'CXXFLAGS=-g -pg' 'JFLAGS=-g -pg' 'FFLAGS=-g -pg' +BuildArgs/Optimized=--enable-maintainer-mode 'CFLAGS=-O2' 'CXXFLAGS=-O2' 'JFLAGS=-O2' 'FFLAGS=-O2' + +[Debugger] +Stop at beginning=2 diff --git a/.anjuta/session/dock-layout.xml b/.anjuta/session/dock-layout.xml new file mode 100644 index 0000000..d8c025d --- /dev/null +++ b/.anjuta/session/dock-layout.xml @@ -0,0 +1,2 @@ + + diff --git a/.anjuta_sym_db.db b/.anjuta_sym_db.db new file mode 100644 index 0000000..9be886b Binary files /dev/null and b/.anjuta_sym_db.db differ diff --git a/.gitignore b/.gitignore index fe2982b..34ed456 100644 --- a/.gitignore +++ b/.gitignore @@ -20,13 +20,19 @@ ltmain.sh m4/ missing stamp-h1 +stamp-it *.stamp +mkinstalldirs docs/reference/html/ docs/reference/xml/ src/.libs/ src/.deps/ tests/.libs/ tests/.deps/ +po/POTFILES +po/Makefile.in.in +po/*.gmo +po/libgdaex.pot *.lo *.o *.la @@ -35,3 +41,5 @@ libgdaex*tar* tests/test_prefix* tests/grid tests/grid.exe +tests/select +tests/select.exe diff --git a/Makefile.am b/Makefile.am index d0a7c6f..1e0cb58 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,6 +1,6 @@ DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc -SUBDIRS = src docs tests +SUBDIRS = po src docs tests ACLOCAL_AMFLAGS = -I m4 diff --git a/config.h.in b/config.h.in index 57ae079..88fd3e3 100644 --- a/config.h.in +++ b/config.h.in @@ -1,11 +1,32 @@ /* config.h.in. Generated from configure.ac by autoheader. */ +/* always defined to indicate that i18n is enabled */ +#undef ENABLE_NLS + +/* The prefix for our gettext translation domains. */ +#undef GETTEXT_PACKAGE + +/* Define to 1 if you have the `bind_textdomain_codeset' function. */ +#undef HAVE_BIND_TEXTDOMAIN_CODESET + +/* Define to 1 if you have the `dcgettext' function. */ +#undef HAVE_DCGETTEXT + /* Define to 1 if you have the header file. */ #undef HAVE_DLFCN_H +/* Define if the GNU gettext() function is already present or preinstalled. */ +#undef HAVE_GETTEXT + /* Define to 1 if you have the header file. */ #undef HAVE_INTTYPES_H +/* Define if your file defines LC_MESSAGES. */ +#undef HAVE_LC_MESSAGES + +/* Define to 1 if you have the header file. */ +#undef HAVE_LOCALE_H + /* Define to 1 if you have the header file. */ #undef HAVE_MEMORY_H diff --git a/configure.ac b/configure.ac index a57926d..6f13e15 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,7 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ(2.59) -AC_INIT([libgdaex], [0.3.1], [azagli@libero.it]) +AC_INIT([libgdaex], [0.4.0], [azagli@libero.it]) AC_CONFIG_SRCDIR([src/gdaex.c]) AM_CONFIG_HEADER([config.h]) @@ -27,6 +27,16 @@ AC_PROG_MAKE_SET AC_PROG_LIBTOOL GTK_DOC_CHECK(1.0) +IT_PROG_INTLTOOL + +dnl ****************************** +dnl Translations +dnl ****************************** +GETTEXT_PACKAGE=libgdaex +AC_SUBST(GETTEXT_PACKAGE) +AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", + [The prefix for our gettext translation domains.]) +AM_GLIB_GNU_GETTEXT # Checks for libraries. PKG_CHECK_MODULES(GDAEX, [libgda-4.0 >= 4 @@ -47,12 +57,13 @@ AC_C_CONST AC_CHECK_FUNCS([strchr strcasecmp]) AC_CONFIG_FILES([ - libgdaex.pc - Makefile - src/Makefile - docs/Makefile - docs/reference/Makefile - docs/reference/version.xml - tests/Makefile + libgdaex.pc + Makefile + src/Makefile + docs/Makefile + docs/reference/Makefile + docs/reference/version.xml + tests/Makefile + po/Makefile.in ]) AC_OUTPUT diff --git a/libgdaex.anjuta b/libgdaex.anjuta new file mode 100644 index 0000000..5e1cf44 --- /dev/null +++ b/libgdaex.anjuta @@ -0,0 +1,47 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/libgdaex.pc.in b/libgdaex.pc.in index 78f22e2..d55b525 100644 --- a/libgdaex.pc.in +++ b/libgdaex.pc.in @@ -6,6 +6,6 @@ includedir=@includedir@ Name: @PACKAGE_NAME@ Description: A libgda's "subclass" Version: @PACKAGE_VERSION@ -Requires: libgda-4.0 +Requires: libgda-4.0 gio-2.0 >= 2.24 gtk+-2.0 >= 2.20 Libs: -L${libdir} -lgdaex Cflags: -I${includedir} diff --git a/po/LINGUAS b/po/LINGUAS new file mode 100644 index 0000000..7d5856f --- /dev/null +++ b/po/LINGUAS @@ -0,0 +1 @@ +it diff --git a/po/POTFILES.in b/po/POTFILES.in new file mode 100644 index 0000000..79e5261 --- /dev/null +++ b/po/POTFILES.in @@ -0,0 +1,2 @@ +# List of source files which contain translatable strings. +src/gdaex.c diff --git a/po/it.po b/po/it.po new file mode 100644 index 0000000..52f3b48 --- /dev/null +++ b/po/it.po @@ -0,0 +1,225 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# Andrea Zagli , 2011. +# +msgid "" +msgstr "" +"Project-Id-Version: libgdaex 0.4.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2011-10-22 10:42+0200\n" +"PO-Revision-Date: 2011-10-22 10:52+0200\n" +"Last-Translator: Andrea Zagli \n" +"Language-Team: Italian \n" +"Language: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#. TO DO +#: ../src/gdaex.c:206 +msgid "Datasource cannot be empty." +msgstr "Datasource non può essere vuota." + +#. TO DO +#: ../src/gdaex.c:214 ../src/gdaex.c:307 +msgid "Unable to create GdaEx object." +msgstr "Impossibile creare l'oggetto GdaEx." + +#: ../src/gdaex.c:273 ../src/gdaex.c:322 +#, c-format +msgid "Error creating database connection: %s" +msgstr "Errore nella creazione della connessione al database: %s" + +#: ../src/gdaex.c:274 ../src/gdaex.c:677 ../src/gdaex.c:694 +#: ../src/gdaex.c:1016 ../src/gdaex.c:1056 ../src/gdaex.c:1095 +#: ../src/gdaex.c:1134 ../src/gdaex.c:1186 ../src/gdaex.c:1281 +#: ../src/gdaex.c:1341 ../src/gdaex.c:1407 ../src/gdaex.c:1457 +#: ../src/gdaex.c:2283 ../src/gdaex.c:2393 ../src/gdaex.c:2440 +#: ../src/gdaex.c:2458 ../src/gdaex.c:2511 ../src/gdaex.c:2570 +#: ../src/gdaex.c:2623 ../src/gdaex.c:2887 ../src/gdaex.c:2905 +msgid "no details" +msgstr "nessun dettaglio" + +#. TO DO +#: ../src/gdaex.c:299 +msgid "cnc_string must not be empty." +msgstr "cnc_string non può essere vuota." + +#: ../src/gdaex.c:323 ../src/gdaex.c:377 ../src/gdaex.c:411 +msgid "no details." +msgstr "nessun dettaglio." + +#: ../src/gdaex.c:376 +#, c-format +msgid "Error on writing on log file: %s" +msgstr "Errore nella scrittura del file di registro: %s" + +#: ../src/gdaex.c:410 +#, c-format +msgid "Error on opening log file: %s" +msgstr "Errore nell'apertura del file di registro: %s" + +#: ../src/gdaex.c:528 +msgid "Unable to get the GdaSqlStatement from the GdaStatement." +msgstr "Impossibile ottenere il GdaSqlStatement dal GdaStatement." + +#: ../src/gdaex.c:642 +#, c-format +msgid "Statement type %s not implemented." +msgstr "Tipo di istruzione %s non implementato." + +#: ../src/gdaex.c:676 +#, c-format +msgid "" +"Error parsing query string: %s\n" +"%s" +msgstr "" +"Errore nell'analisi della stringa della query: %s\n" +"%s" + +#: ../src/gdaex.c:693 +#, c-format +msgid "" +"Error executing selection query: %s\n" +"%s" +msgstr "" +"Errore nell'esecuzione della query di selezione: %s\n" +"%s" + +#: ../src/gdaex.c:701 +#, c-format +msgid "Selection query executed: %s" +msgstr "Query di selezione eseguita: %s" + +#: ../src/gdaex.c:732 ../src/gdaex.c:763 ../src/gdaex.c:793 ../src/gdaex.c:823 +#: ../src/gdaex.c:853 ../src/gdaex.c:883 ../src/gdaex.c:914 ../src/gdaex.c:945 +#: ../src/gdaex.c:976 ../src/gdaex.c:1488 ../src/gdaex.c:1520 +#: ../src/gdaex.c:1551 ../src/gdaex.c:1582 ../src/gdaex.c:1613 +#: ../src/gdaex.c:1644 ../src/gdaex.c:1676 ../src/gdaex.c:1708 +#: ../src/gdaex.c:1740 +#, c-format +msgid "No column found with name «%s»." +msgstr "Nessuna colonna trovata con il nome «%s»." + +#: ../src/gdaex.c:1014 ../src/gdaex.c:1054 ../src/gdaex.c:1093 +#: ../src/gdaex.c:1132 ../src/gdaex.c:1184 ../src/gdaex.c:1279 +#: ../src/gdaex.c:1339 ../src/gdaex.c:1405 ../src/gdaex.c:1455 +#, c-format +msgid "" +"Error on retrieving field's value: «%s».\n" +"%s\n" +msgstr "" +"Errore nell'ottenere il valore del campo: «%s»\n" +"%s\n" + +#: ../src/gdaex.c:1272 ../src/gdaex.c:1332 ../src/gdaex.c:1398 +#, c-format +msgid "" +"Error on retrieving field's value: «%s».\n" +"Unknown GValue type." +msgstr "" +"Errore nell'ottenere il valore del campo: «%s».\n" +"Tipo GValue sconosciuto." + +#: ../src/gdaex.c:1767 ../src/gdaex.c:1805 ../src/gdaex.c:1843 +#: ../src/gdaex.c:1881 ../src/gdaex.c:1919 ../src/gdaex.c:1972 +#: ../src/gdaex.c:2065 ../src/gdaex.c:2123 ../src/gdaex.c:2183 +#, c-format +msgid "Error on retrieving field's value: «%s»." +msgstr "Errore nell'ottenere il valore del campo: «%s»." + +#: ../src/gdaex.c:2034 ../src/gdaex.c:2090 ../src/gdaex.c:2154 +msgid "Error on retrieving field's value: unknown GValue type." +msgstr "Impossibile ottenere il valore del campo: tipo GValue sconosciuto." + +#: ../src/gdaex.c:2281 +#, c-format +msgid "Error on retrieving column %d: %s" +msgstr "Errore nell'ottenere la colonna %d: %s" + +#: ../src/gdaex.c:2331 +msgid "Invalid GdaDataModel." +msgstr "GdaDataModel non valido." + +#: ../src/gdaex.c:2345 +msgid "Unable to create the GtkTreeModel." +msgstr "Impossibile creare il GtkTreeModel." + +#: ../src/gdaex.c:2392 +#, c-format +msgid "Error opening transaction: %s\n" +msgstr "Errore nell'apertura della transazione: %s\n" + +#: ../src/gdaex.c:2399 +msgid "Transaction opened." +msgstr "Transazione aperta." + +#: ../src/gdaex.c:2433 +#, c-format +msgid "" +"REMAINS:\n" +"%s\n" +"from\n" +"%s" +msgstr "" +"RIMANE:\n" +"%s\n" +"da\n" +"%s" + +#: ../src/gdaex.c:2439 ../src/gdaex.c:2510 +#, c-format +msgid "" +"Error parsing sql: %s\n" +"%s" +msgstr "" +"Errore nell'analisi dell'sql: %s\n" +"%s" + +#: ../src/gdaex.c:2457 +#, c-format +msgid "" +"Error executing command query: %s\n" +"%s" +msgstr "" +"Errore nell'esecuzione della query di comando: %s\n" +"%s" + +#: ../src/gdaex.c:2465 +#, c-format +msgid "Query executed: %s" +msgstr "Query eseguita: %s" + +#: ../src/gdaex.c:2559 ../src/gdaex.c:2612 +msgid "No transaction opened." +msgstr "Nessuna transazione aperta." + +#: ../src/gdaex.c:2569 +#, c-format +msgid "Error committing transaction: %s" +msgstr "Errore nel committare la transazione: %s" + +#: ../src/gdaex.c:2577 +msgid "Transaction committed." +msgstr "Transazione committata." + +#: ../src/gdaex.c:2622 +#, c-format +msgid "Error rollbacking transaction: %s" +msgstr "Errore nel rollbacking della transazione: %s" + +#: ../src/gdaex.c:2630 +msgid "Transaction rolled back." +msgstr "Transazione rolled back." + +#: ../src/gdaex.c:2886 +#, c-format +msgid "Error on creating regex: %s" +msgstr "Errore nella creazione dell'espressione regolare: %s" + +#: ../src/gdaex.c:2904 +#, c-format +msgid "Error on regex replacing: %s" +msgstr "Errore nell'espressione regolare di sostituzione: %s" diff --git a/src/Makefile.am b/src/Makefile.am index 167a7ca..2f23eaf 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,5 +1,6 @@ AM_CPPFLAGS = -I$(top_srcdir) \ $(GDAEX_CFLAGS) \ + -DLOCALEDIR=\"$(localedir)\" \ -DG_LOG_DOMAIN=\"GdaEx\" LIBS = $(GDAEX_LIBS) diff --git a/src/gdaex.c b/src/gdaex.c index 2f7b907..aaa931d 100644 --- a/src/gdaex.c +++ b/src/gdaex.c @@ -28,7 +28,10 @@ #include #include +#include + #include + #include #include "gdaex.h" @@ -129,10 +132,49 @@ gdaex_init (GdaEx *gdaex) static GdaEx *gdaex_new_ () { + gchar *localedir; + GdaEx *gdaex = GDAEX (g_object_new (gdaex_get_type (), NULL)); GdaExPrivate *priv = GDAEX_GET_PRIVATE (gdaex); + setlocale (LC_ALL, ""); + gda_locale_changed (); + +#ifdef G_OS_WIN32 + + gchar *moddir; + gchar *p; + + moddir = g_win32_get_package_installation_directory_of_module (NULL); + + p = g_strrstr (moddir, g_strdup_printf ("%c", G_DIR_SEPARATOR)); + if (p != NULL + && (g_ascii_strcasecmp (p + 1, "src") == 0 + || g_ascii_strcasecmp (p + 1, ".libs") == 0)) + { + localedir = g_strdup (LOCALEDIR); + } + else + { + localedir = g_build_filename (moddir, "share", "locale", NULL); + } + + g_free (moddir); + g_free (p); + +#else + + localedir = g_strdup (LOCALEDIR); + +#endif + + bindtextdomain (GETTEXT_PACKAGE, localedir); + textdomain (GETTEXT_PACKAGE); + bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); + + g_free (localedir); + return gdaex; } @@ -161,7 +203,7 @@ GdaEx if (dsn == NULL || strcmp (g_strstrip (g_strdup (dsn)), "") == 0) { /* TO DO */ - g_warning ("datasource must not be empty."); + g_warning (_("Datasource cannot be empty.")); return NULL; } @@ -169,6 +211,7 @@ GdaEx if (gdaex == NULL) { /* TO DO */ + g_warning (_("Unable to create GdaEx object.")); return NULL; } @@ -227,8 +270,8 @@ GdaEx &error); if (error != NULL) { - g_warning ("Error creating database connection: %s\n", - error->message); + g_warning (_("Error creating database connection: %s"), + error->message != NULL ? error->message : _("no details")); return NULL; } @@ -253,7 +296,7 @@ GdaEx if (cnc_string == NULL || strcmp (g_strstrip (g_strdup (cnc_string)), "") == 0) { /* TO DO */ - g_warning ("cnc_string must not be empty."); + g_warning (_("cnc_string must not be empty.")); return NULL; } @@ -261,6 +304,7 @@ GdaEx if (gdaex == NULL) { /* TO DO */ + g_warning (_("Unable to create GdaEx object.")); return NULL; } @@ -275,8 +319,8 @@ GdaEx &error); if (error != NULL) { - g_warning ("Error creating database connection: %s", - error->message != NULL ? error->message : "no details."); + g_warning (_("Error creating database connection: %s"), + error->message != NULL ? error->message : _("no details.")); return NULL; } @@ -329,8 +373,8 @@ gdaex_log_handler (const gchar *log_domain, if (g_output_stream_write (G_OUTPUT_STREAM (priv->log_file), msg, strlen (msg), NULL, &error) < 0) { - g_warning ("Error on writing on log file: %s", - error != NULL && error->message != NULL ? error->message : "no details."); + g_warning (_("Error on writing on log file: %s"), + error != NULL && error->message != NULL ? error->message : _("no details.")); } } @@ -363,8 +407,8 @@ gdaex_post_parse_options (GOptionContext *context, NULL, FALSE, G_FILE_CREATE_NONE, NULL, &my_error); if (priv->log_file == NULL) { - g_warning ("Error on opening log file: %s.", - my_error != NULL && my_error->message != NULL ? my_error->message : "no details."); + g_warning (_("Error on opening log file: %s"), + my_error != NULL && my_error->message != NULL ? my_error->message : _("no details.")); } else { @@ -481,7 +525,7 @@ gdaex_set_tables_name_prefix_into_statement (GdaEx *gdaex, GdaStatement **stmt) g_object_get (G_OBJECT (stmp), "structure", &sstmt, NULL); if (sstmt == NULL) { - g_warning ("Unable to get the GdaSqlStatement from the GdaStatement."); + g_warning (_("Unable to get the GdaSqlStatement from the GdaStatement.")); return; } @@ -595,7 +639,7 @@ gdaex_set_tables_name_prefix_into_statement (GdaEx *gdaex, GdaStatement **stmt) break; default: - g_warning ("Statement type %s not implemented.", + g_warning (_("Statement type %s not implemented."), gda_sql_statement_type_to_string (sstmt->stmt_type)); return; } @@ -629,8 +673,8 @@ GdaDataModel stmt = gda_sql_parser_parse_string (priv->gda_parser, sql, NULL, &error); if (!GDA_IS_STATEMENT (stmt)) { - g_warning ("Error parsing query string: %s\n%s", - error != NULL && error->message != NULL ? error->message : "no details", sql); + g_warning (_("Error parsing query string: %s\n%s"), + error != NULL && error->message != NULL ? error->message : _("no details"), sql); return NULL; } @@ -646,15 +690,15 @@ GdaDataModel if (!GDA_IS_DATA_MODEL (dm)) { - g_warning ("Error executing selection query: %s\n%s", - error != NULL && error->message != NULL ? error->message : "no details", sql); + g_warning (_("Error executing selection query: %s\n%s"), + error != NULL && error->message != NULL ? error->message : _("no details"), sql); return NULL; } else { if (priv->debug > 0) { - g_message ("Selection query executed: %s", sql); + g_message (_("Selection query executed: %s"), sql); } } @@ -685,7 +729,7 @@ gchar } else { - g_warning ("No column found with name «%s».", field_name); + g_warning (_("No column found with name «%s»."), field_name); value = NULL; } @@ -716,7 +760,7 @@ gdaex_data_model_get_field_value_integer_at (GdaDataModel *data_model, } else { - g_warning ("No column found with name «%s».", field_name); + g_warning (_("No column found with name «%s»."), field_name); } return value; @@ -746,7 +790,7 @@ gdaex_data_model_get_field_value_float_at (GdaDataModel *data_model, } else { - g_warning ("No column found with name «%s».", field_name); + g_warning (_("No column found with name «%s»."), field_name); } return value; @@ -776,7 +820,7 @@ gdaex_data_model_get_field_value_double_at (GdaDataModel *data_model, } else { - g_warning ("No column found with name «%s».", field_name); + g_warning (_("No column found with name «%s»."), field_name); } return value; @@ -806,7 +850,7 @@ gdaex_data_model_get_field_value_boolean_at (GdaDataModel *data_model, } else { - g_warning ("No column found with name «%s».", field_name); + g_warning (_("No column found with name «%s»."), field_name); } return value; @@ -836,7 +880,7 @@ GdaTimestamp } else { - g_warning ("No column found with name «%s».", field_name); + g_warning (_("No column found with name «%s»."), field_name); value = NULL; } @@ -867,7 +911,7 @@ GDate } else { - g_warning ("No column found with name «%s».", field_name); + g_warning (_("No column found with name «%s»."), field_name); value = NULL; } @@ -898,7 +942,7 @@ GDateTime } else { - g_warning ("No column found with name «%s».", field_name); + g_warning (_("No column found with name «%s»."), field_name); value = NULL; } @@ -929,7 +973,7 @@ struct tm } else { - g_warning ("No column found with name «%s».", field_name); + g_warning (_("No column found with name «%s»."), field_name); value = NULL; } @@ -967,9 +1011,9 @@ gchar } else { - g_warning ("Error on retrieving field's value: «%s».\n%s\n", + g_warning (_("Error on retrieving field's value: «%s».\n%s\n"), gda_data_model_get_column_name (data_model, col), - error->message != NULL ? error->message : "no details"); + error->message != NULL ? error->message : _("no details")); ret = NULL; } @@ -1007,9 +1051,9 @@ gdaex_data_model_get_value_integer_at (GdaDataModel *data_model, gint row, gint } else { - g_warning ("Error on retrieving field's value: «%s».\n%s\n", + g_warning (_("Error on retrieving field's value: «%s».\n%s\n"), gda_data_model_get_column_name (data_model, col), - error->message != NULL ? error->message : "no details"); + error->message != NULL ? error->message : _("no details")); } return ret; @@ -1046,9 +1090,9 @@ gdaex_data_model_get_value_float_at (GdaDataModel *data_model, gint row, gint co } else { - g_warning ("Error on retrieving field's value: «%s».\n%s\n", + g_warning (_("Error on retrieving field's value: «%s».\n%s\n"), gda_data_model_get_column_name (data_model, col), - error->message != NULL ? error->message : "no details"); + error->message != NULL ? error->message : _("no details")); } return ret; @@ -1085,9 +1129,9 @@ gdaex_data_model_get_value_double_at (GdaDataModel *data_model, gint row, gint c } else { - g_warning ("Error on retrieving field's value: «%s».\n%s\n", + g_warning (_("Error on retrieving field's value: «%s».\n%s\n"), gda_data_model_get_column_name (data_model, col), - error->message != NULL ? error->message : "no details"); + error->message != NULL ? error->message : _("no details")); } return ret; @@ -1137,9 +1181,9 @@ gdaex_data_model_get_value_boolean_at (GdaDataModel *data_model, gint row, gint } else { - g_warning ("Error on retrieving field's value: «%s».\n%s\n", + g_warning (_("Error on retrieving field's value: «%s».\n%s\n"), gda_data_model_get_column_name (data_model, col), - error->message != NULL ? error->message : "no details"); + error->message != NULL ? error->message : _("no details")); } return ret; @@ -1225,16 +1269,16 @@ GdaTimestamp } else { - g_warning ("Error on retrieving field's value: «%s».\nUnknown GValue type.", + g_warning (_("Error on retrieving field's value: «%s».\nUnknown GValue type."), gda_data_model_get_column_name (data_model, col)); } } } else { - g_warning ("Error on retrieving field's value: «%s».\n%s\n", + g_warning (_("Error on retrieving field's value: «%s».\n%s\n"), gda_data_model_get_column_name (data_model, col), - error->message != NULL ? error->message : "no details"); + error->message != NULL ? error->message : _("no details")); } return (GdaTimestamp *)gda_timestamp_copy ((gpointer)gdatimestamp); @@ -1285,16 +1329,16 @@ GDate } else { - g_warning ("Error on retrieving field's value: «%s».\nUnknown GValue type.", + g_warning (_("Error on retrieving field's value: «%s».\nUnknown GValue type."), gda_data_model_get_column_name (data_model, col)); } } } else { - g_warning ("Error on retrieving field's value: «%s».\n%s\n", + g_warning (_("Error on retrieving field's value: «%s».\n%s\n"), gda_data_model_get_column_name (data_model, col), - error->message != NULL ? error->message : "no details"); + error->message != NULL ? error->message : _("no details")); } return ret; @@ -1351,16 +1395,16 @@ GDateTime } else { - g_warning ("Error on retrieving field's value: «%s».\nUnknown GValue type.", + g_warning (_("Error on retrieving field's value: «%s».\nUnknown GValue type."), gda_data_model_get_column_name (data_model, col)); } } } else { - g_warning ("Error on retrieving field's value: «%s».\n%s\n", + g_warning (_("Error on retrieving field's value: «%s».\n%s\n"), gda_data_model_get_column_name (data_model, col), - error->message != NULL ? error->message : "no details"); + error->message != NULL ? error->message : _("no details")); } return ret; @@ -1408,9 +1452,9 @@ struct tm } else { - g_warning ("Error on retrieving field's value: «%s».\n%s\n", + g_warning (_("Error on retrieving field's value: «%s».\n%s\n"), gda_data_model_get_column_name (data_model, col), - error->message != NULL ? error->message : "no details"); + error->message != NULL ? error->message : _("no details")); } return ret; @@ -1441,7 +1485,7 @@ gchar } else { - g_warning ("No column found with name «%s».", field_name); + g_warning (_("No column found with name «%s»."), field_name); value = NULL; } @@ -1473,7 +1517,7 @@ gdaex_data_model_iter_get_field_value_integer_at (GdaDataModelIter *iter, } else { - g_warning ("No column found with name «%s».", field_name); + g_warning (_("No column found with name «%s»."), field_name); } return value; @@ -1504,7 +1548,7 @@ gdaex_data_model_iter_get_field_value_float_at (GdaDataModelIter *iter, } else { - g_warning ("No column found with name «%s».", field_name); + g_warning (_("No column found with name «%s»."), field_name); } return value; @@ -1535,7 +1579,7 @@ gdaex_data_model_iter_get_field_value_double_at (GdaDataModelIter *iter, } else { - g_warning ("No column found with name «%s».", field_name); + g_warning (_("No column found with name «%s»."), field_name); } return value; @@ -1566,7 +1610,7 @@ gdaex_data_model_iter_get_field_value_boolean_at (GdaDataModelIter *iter, } else { - g_warning ("No column found with name «%s».", field_name); + g_warning (_("No column found with name «%s»."), field_name); } return value; @@ -1597,7 +1641,7 @@ GdaTimestamp } else { - g_warning ("No column found with name «%s».", field_name); + g_warning (_("No column found with name «%s»."), field_name); value = NULL; } @@ -1629,7 +1673,7 @@ GDate } else { - g_warning ("No column found with name «%s».", field_name); + g_warning (_("No column found with name «%s»."), field_name); value = NULL; } @@ -1661,7 +1705,7 @@ GDateTime } else { - g_warning ("No column found with name «%s».", field_name); + g_warning (_("No column found with name «%s»."), field_name); value = NULL; } @@ -1693,7 +1737,7 @@ struct tm } else { - g_warning ("No column found with name «%s».", field_name); + g_warning (_("No column found with name «%s»."), field_name); value = NULL; } @@ -1720,7 +1764,7 @@ gchar g_object_get (G_OBJECT (iter), "data-model", &data_model, NULL); - g_warning ("Error on retrieving field's value: «%s».", + g_warning (_("Error on retrieving field's value: «%s»."), gda_data_model_get_column_name (data_model, col)); } else @@ -1758,7 +1802,7 @@ gdaex_data_model_iter_get_value_integer_at (GdaDataModelIter *iter, gint col) g_object_get (G_OBJECT (iter), "data-model", &data_model, NULL); - g_warning ("Error on retrieving field's value: «%s».", + g_warning (_("Error on retrieving field's value: «%s»."), gda_data_model_get_column_name (data_model, col)); } else @@ -1796,7 +1840,7 @@ gdaex_data_model_iter_get_value_float_at (GdaDataModelIter *iter, gint col) g_object_get (G_OBJECT (iter), "data-model", &data_model, NULL); - g_warning ("Error on retrieving field's value: «%s».", + g_warning (_("Error on retrieving field's value: «%s»."), gda_data_model_get_column_name (data_model, col)); } else @@ -1834,7 +1878,7 @@ gdaex_data_model_iter_get_value_double_at (GdaDataModelIter *iter, gint col) g_object_get (G_OBJECT (iter), "data-model", &data_model, NULL); - g_warning ("Error on retrieving field's value: «%s».", + g_warning (_("Error on retrieving field's value: «%s»."), gda_data_model_get_column_name (data_model, col)); } else @@ -1872,7 +1916,7 @@ gdaex_data_model_iter_get_value_boolean_at (GdaDataModelIter *iter, gint col) g_object_get (G_OBJECT (iter), "data-model", &data_model, NULL); - g_warning ("Error on retrieving field's value: «%s».", + g_warning (_("Error on retrieving field's value: «%s»."), gda_data_model_get_column_name (data_model, col)); } else @@ -1925,7 +1969,7 @@ GdaTimestamp g_object_get (G_OBJECT (iter), "data-model", &data_model, NULL); - g_warning ("Error on retrieving field's value: «%s».", + g_warning (_("Error on retrieving field's value: «%s»."), gda_data_model_get_column_name (data_model, col)); } else if (!gda_value_is_null (v)) @@ -1987,7 +2031,7 @@ GdaTimestamp } else { - g_warning ("Error on retrieving field's value: unknown GValue type."); + g_warning (_("Error on retrieving field's value: unknown GValue type.")); } } @@ -2018,7 +2062,7 @@ GDate g_object_get (G_OBJECT (iter), "data-model", &data_model, NULL); - g_warning ("Error on retrieving field's value: «%s».", + g_warning (_("Error on retrieving field's value: «%s»."), gda_data_model_get_column_name (data_model, col)); } else if (!gda_value_is_null (v)) @@ -2043,7 +2087,7 @@ GDate } else { - g_warning ("Error on retrieving field's value: unknown GValue type."); + g_warning (_("Error on retrieving field's value: unknown GValue type.")); } } @@ -2076,7 +2120,7 @@ GDateTime g_object_get (G_OBJECT (iter), "data-model", &data_model, NULL); - g_warning ("Error on retrieving field's value: «%s».", + g_warning (_("Error on retrieving field's value: «%s»."), gda_data_model_get_column_name (data_model, col)); } else if (!gda_value_is_null (v)) @@ -2107,7 +2151,7 @@ GDateTime } else { - g_warning ("Error on retrieving field's value: unknown GValue type."); + g_warning (_("Error on retrieving field's value: unknown GValue type.")); } } @@ -2136,7 +2180,7 @@ struct tm g_object_get (G_OBJECT (iter), "data-model", &data_model, NULL); - g_warning ("Error on retrieving field's value: «%s».", + g_warning (_("Error on retrieving field's value: «%s»."), gda_data_model_get_column_name (data_model, col)); } else if (!gda_value_is_null (v)) @@ -2234,9 +2278,9 @@ GHashTable v = gda_data_model_get_value_at (dm, col, row, &error); if (v == NULL || error != NULL) { - g_warning ("Error on retrieving column %d: %s", + g_warning (_("Error on retrieving column %d: %s"), col, - error != NULL && error->message != NULL ? error->message : "no details"); + error != NULL && error->message != NULL ? error->message : _("no details")); } else { @@ -2284,7 +2328,7 @@ GtkListStore cols = gda_data_model_get_n_columns (dm); if (cols == 0) { - g_warning ("Invalid GdaDataModel."); + g_warning (_("Invalid GdaDataModel.")); return NULL; } @@ -2298,7 +2342,7 @@ GtkListStore ret = gtk_list_store_newv (cols, gtypes); if (ret == NULL) { - g_warning ("Unable to create the GtkTreeModel."); + g_warning (_("Unable to create the GtkTreeModel.")); return NULL; } @@ -2345,14 +2389,14 @@ gdaex_begin (GdaEx *gdaex) if (error != NULL) { - g_warning ("Error opening transaction: %s\n", - error->message != NULL ? error->message : "no details"); + g_warning (_("Error opening transaction: %s\n"), + error->message != NULL ? error->message : _("no details")); } else { if (priv->debug > 0) { - g_message ("Transaction opened."); + g_message (_("Transaction opened.")); } } @@ -2386,14 +2430,14 @@ gdaex_execute (GdaEx *gdaex, const gchar *sql) stmt = gda_sql_parser_parse_string (priv->gda_parser, sql, &remain, &error); if (remain) { - g_warning ("REMAINS:\n%s\nfrom\n%s", remain, sql); + g_warning (_("REMAINS:\n%s\nfrom\n%s"), remain, sql); } if (error != NULL) { g_object_unref (stmt); - g_warning ("Error parsing sql: %s\n%s\n", - error->message != NULL ? error->message : "no details", sql); + g_warning (_("Error parsing sql: %s\n%s"), + error->message != NULL ? error->message : _("no details"), sql); return -1; } @@ -2410,15 +2454,15 @@ gdaex_execute (GdaEx *gdaex, const gchar *sql) if (error != NULL) { - g_warning ("Error executing command query: %s\n%s", - error->message != NULL ? error->message : "no details", sql); + g_warning (_("Error executing command query: %s\n%s"), + error->message != NULL ? error->message : _("no details"), sql); return -1; } else { if (priv->debug > 0) { - g_message ("Query executed: %s", sql); + g_message (_("Query executed: %s"), sql); } } @@ -2463,8 +2507,8 @@ GSList stmt = gda_sql_parser_parse_string (priv->gda_parser, sql, NULL, &error); if (error != NULL) { - g_warning ("Error parsing sql: %s\n%s\n", - error->message != NULL ? error->message : "no details", sql); + g_warning (_("Error parsing sql: %s\n%s"), + error->message != NULL ? error->message : _("no details"), sql); return NULL; } @@ -2512,7 +2556,7 @@ gdaex_commit (GdaEx *gdaex) ret = TRUE; if (priv->debug > 0) { - g_message ("No transaction opened."); + g_message (_("No transaction opened.")); } } else @@ -2522,15 +2566,15 @@ gdaex_commit (GdaEx *gdaex) if (error != NULL) { - g_warning ("Error committing transaction: %s\n", - error->message); + g_warning (_("Error committing transaction: %s"), + error->message != NULL ? error->message : _("no details")); ret = FALSE; } else { if (priv->debug > 0) { - g_message ("Transaction committed."); + g_message (_("Transaction committed.")); } } } @@ -2565,7 +2609,7 @@ gdaex_rollback (GdaEx *gdaex) ret = TRUE; if (priv->debug > 0) { - g_message ("No transaction opened."); + g_message (_("No transaction opened.")); } } else @@ -2575,15 +2619,15 @@ gdaex_rollback (GdaEx *gdaex) if (error != NULL) { - g_warning ("Error rollbacking transaction: %s\n", - error->message); + g_warning (_("Error rollbacking transaction: %s"), + error->message != NULL ? error->message : _("no details")); ret = FALSE; } else { if (priv->debug > 0) { - g_message ("Transaction rolled back."); + g_message (_("Transaction rolled back.")); } } } @@ -2839,8 +2883,8 @@ gchar regex = g_regex_new ("(^[-\\d]?\\d+)(\\d\\d\\d)", 0, 0, &error); if (error != NULL) { - g_warning ("Error on creating regex: %s.", - error->message != NULL ? error->message : "no details"); + g_warning (_("Error on creating regex: %s"), + error->message != NULL ? error->message : _("no details")); return ""; } @@ -2857,8 +2901,8 @@ gchar &error); if (error != NULL) { - g_warning ("Error on regex replacing: %s.", - error->message != NULL ? error->message : "no details"); + g_warning (_("Error on regex replacing: %s"), + error->message != NULL ? error->message : _("no details")); g_regex_unref (regex); return ""; } diff --git a/tests/Makefile.am b/tests/Makefile.am index 8081d40..8d70a92 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -5,8 +5,9 @@ AM_CPPFLAGS = $(GDAEX_CFLAGS) \ -I$(top_srcdir)/src \ -DTESTSDIR="\"@abs_builddir@\"" -noinst_PROGRAMS = test_prefix \ - grid +noinst_PROGRAMS = grid \ + select \ + test_prefix LDADD = $(top_builddir)/src/libgdaex.la diff --git a/tests/select.c b/tests/select.c new file mode 100644 index 0000000..b48f3fb --- /dev/null +++ b/tests/select.c @@ -0,0 +1,43 @@ +/* + * Copyright (C) 2011 Andrea Zagli + * + * 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 + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + */ + +#include + +int +main (int argc, char **argv) +{ + GdaEx *gdaex; + + gchar *sql; + GdaDataModel *dm; + + gtk_init (&argc, &argv); + + gdaex = gdaex_new_from_string (g_strdup_printf ("SQLite://DB_DIR=%s;DB_NAME=grid.db", TESTSDIR)); + if (gdaex == NULL) + { + g_error ("Unable to connect to the db."); + } + + sql = g_strdup_printf ("SELECT * FROM clientssss"); + dm = gdaex_query (gdaex, sql); + g_free (sql); + g_object_unref (dm); + + return 0; +}