Get currency symbol and thousands separator from locale in ::format_money and ::unfor...

Added test form ::format_money and ::unformat_money.

diff --git a/.gitignore b/.gitignore
index 8129d065c7f857c37bb7f0e653878e9baf5e5522..5b43953a5983e5ff4325d4c1bb3b6ad5c8db560e 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -50,3 +50,4 @@ intltool-*
 Rules-quot
 *.exe
 *.csv
+tests/format_money
\ No newline at end of file

diff --git a/src/generic.c b/src/generic.c
index f732001e969f12a5466a3617510da22c8d8c8dd4..b343c34f25133023a4ab34ae3f538502a77520f4 100644 (file)
--- a/src/generic.c
+++ b/src/generic.c
@@ -23,6 +23,7 @@
 #include <stdlib.h>
 #include <math.h>
 #include <string.h>
+#include <locale.h>
 
 #include "generic.h"
 
@@ -124,9 +125,13 @@ gchar
 
        /* TODO
         * - get number of decimals from locale
-        * - get grouping char from locale
-        * - get currency symbol from locale
         */
+       struct lconv *localeinfo;
+
+       setlocale (LC_NUMERIC, "");
+       setlocale (LC_MONETARY, "");
+
+       localeinfo = localeconv ();
 
        ret = g_strdup ("");
 
@@ -148,7 +153,7 @@ gchar
                        str_len = g_utf8_strlen (ret, -1);
                        str = g_regex_replace ((const GRegex *)regex,
                                               ret, str_len, 0,
-                                              "\\1.\\2", 0,
+                                              g_strdup_printf ("\\1%s\\2", localeinfo->mon_thousands_sep), 0,
                                               &error);
                        if (error != NULL)
                                {
@@ -170,7 +175,7 @@ gchar
 
        if (with_currency_symbol)
                {
-                       ret = g_strconcat ("€ ", ret, NULL);
+                       ret = g_strconcat (localeinfo->currency_symbol, " ", ret, NULL);
                }
 
        g_regex_unref (regex);
@@ -193,10 +198,17 @@ zak_utils_unformat_money (const gchar *value)
 
        gchar *str;
 
+       struct lconv *localeinfo;
+
        ret = 0.0;
 
+       setlocale (LC_NUMERIC, "");
+       setlocale (LC_MONETARY, "");
+
+       localeinfo = localeconv ();
+
        error = NULL;
-       regex = g_regex_new ("[€ .]", 0, 0, &error);
+       regex = g_regex_new (g_strdup_printf ("[%s %s]", localeinfo->currency_symbol, localeinfo->mon_thousands_sep), 0, 0, &error);
        if (error != NULL)
                {
                        g_warning ("Error on creating regex: %s.",

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 7d47be1fe390bede512a0315eba27b0d26379c96..104ca6319f4836184be30a0aa2e3516ed5b424d1 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -8,4 +8,7 @@ LIBS = $(ZAKUTILS_LIBS) \
 
 LDADD = $(top_builddir)/src/libzakutils.la
 
-noinst_PROGRAMS =
+noinst_PROGRAMS = \
+                  format_money
+
+format_money_LDADD = $(top_builddir)/src/libzakutils.la -lm

diff --git a/tests/format_money.c b/tests/format_money.c
new file mode 100644 (file)
index 0000000..abaf820
--- /dev/null
+++ b/tests/format_money.c
@@ -0,0 +1,51 @@
+/*
+ * Copyright (C) 2015 Andrea Zagli <azagli@libero.it>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+#include <stdlib.h>
+#include <math.h>
+
+#include "generic.h"
+
+int
+main (int argc, char *argv[])
+{
+       gchar *str;
+       guint n_dec;
+       gboolean with_currency_symbol;
+
+       n_dec = -1;
+       with_currency_symbol = FALSE;
+
+       if (argc >= 3)
+               {
+                       n_dec = strtol (argv[2], NULL, 10);
+               }
+       if (argc >= 4)
+               {
+                   with_currency_symbol = TRUE;
+               }
+
+       g_message ("VALUE %s DOUBLE %s", argv[1], g_strdup_printf (g_strdup_printf ("%%.%df", n_dec), g_strtod (argv[1], NULL)));
+       g_message ("DECIMALS %d", n_dec);
+       str = zak_utils_format_money (g_strtod (argv[1], NULL), n_dec, with_currency_symbol);
+       g_message ("FORMAT %s", str);
+
+       g_message ("UNFORMAT %f", zak_utils_unformat_money (str));
+
+       return 0;
+}