From ed95144fcee0d1f01344c34967b8979cca102bf7 Mon Sep 17 00:00:00 2001
From: Andrea Zagli <azagli@libero.it>
Date: Sun, 13 Dec 2015 11:07:46 +0100
Subject: [PATCH] Get currency symbol and thousands separator from locale in
 ::format_money and ::unformat_money.

Added test form ::format_money and ::unformat_money.
---
 .gitignore           |  1 +
 src/generic.c        | 22 ++++++++++++++-----
 tests/Makefile.am    |  5 ++++-
 tests/format_money.c | 51 ++++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 73 insertions(+), 6 deletions(-)
 create mode 100644 tests/format_money.c

diff --git a/.gitignore b/.gitignore
index 8129d06..5b43953 100644
--- 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 f732001..b343c34 100644
--- 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 7d47be1..104ca63 100644
--- 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
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;
+}
-- 
2.49.0