From 7d616a87f37c362ac28fd2509b8d16fc32ce325a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Sun, 27 Aug 2006 22:10:47 +0000
Subject: [PATCH] Gestion format nombre selon langue

---
 htdocs/langs/en_US/main.lang |  2 ++
 htdocs/langs/fr_BE/main.lang |  3 +++
 htdocs/langs/fr_FR/main.lang |  2 ++
 htdocs/langs/nl_BE/main.lang |  2 ++
 htdocs/lib/functions.inc.php | 20 +++++++++++++++-----
 5 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang
index 4fe0a82631d..df082609892 100644
--- a/htdocs/langs/en_US/main.lang
+++ b/htdocs/langs/en_US/main.lang
@@ -1,5 +1,7 @@
 # Dolibarr language file - en_US - main
 charset=iso-8859-1
+SeparatorDecimal=.
+SeparatorThousand=,
 Error=Error
 ErrorFieldRequired=Field '%s' is required
 ErrorFieldFormat=Field '%s' has a bad value
diff --git a/htdocs/langs/fr_BE/main.lang b/htdocs/langs/fr_BE/main.lang
index f875ec84590..7c9e607b037 100644
--- a/htdocs/langs/fr_BE/main.lang
+++ b/htdocs/langs/fr_BE/main.lang
@@ -1,4 +1,7 @@
+# Dolibarr language file - fr_BE - main
 charset=iso-8859-1
+SeparatorDecimal=,
+SeparatorThousand= 
 Error=Erreur
 ErrorFieldRequired=Le champ '%s' est obligatoire
 ErrorFileDoesNotExists=Le fichier %s n'existe pas
diff --git a/htdocs/langs/fr_FR/main.lang b/htdocs/langs/fr_FR/main.lang
index 0f265dd2df8..4d08633065b 100644
--- a/htdocs/langs/fr_FR/main.lang
+++ b/htdocs/langs/fr_FR/main.lang
@@ -1,5 +1,7 @@
 # Dolibarr language file - fr_FR - main
 charset=iso-8859-1
+SeparatorDecimal=,
+SeparatorThousand= 
 Error=Erreur
 ErrorFieldRequired=Le champ '%s' est obligatoire
 ErrorFieldFormat=Le champ '%s' a une valeur incorrecte
diff --git a/htdocs/langs/nl_BE/main.lang b/htdocs/langs/nl_BE/main.lang
index 539570146f1..ade5bc99409 100644
--- a/htdocs/langs/nl_BE/main.lang
+++ b/htdocs/langs/nl_BE/main.lang
@@ -1,5 +1,7 @@
 # Dolibarr language file - nl_BE - main
 charset=iso-8859-1
+SeparatorDecimal=,
+SeparatorThousand= 
 Error=Fout
 ErrorForbidden=Toegangs verboden
 ErrorFileDoesNotExists=Bestand %s Bestaat Niet
diff --git a/htdocs/lib/functions.inc.php b/htdocs/lib/functions.inc.php
index 24b33232130..c806304b423 100644
--- a/htdocs/lib/functions.inc.php
+++ b/htdocs/lib/functions.inc.php
@@ -1710,20 +1710,30 @@ function print_duree_select($prefix)
 		\remarks    Fonction utilisée dans les pdf et les pages html
 		\param	    amount			Montant a formater
 		\param	    html			Formatage html ou pas (0 par defaut)
+		\param	    langs			Objet langs
 		\seealso	price2num		Fonction inverse de price
 */
-function price($amount, $html=0)
+function price($amount, $html=0, $langs='')
 {
+	// Separateurs par defaut
+	$dec='.'; $thousand=' ';
+
+	// Si $langs defini
+	if (is_object($langs))
+	{
+		if ($langs->trans("SeparatorDecimal") != "SeparatorDecimal")  $dec=$langs->trans("SeparatorDecimal");
+		if ($langs->trans("SeparatorThousand")!= "SeparatorThousand") $thousand=$langs->trans("SeparatorThousand");
+		//print "x".$langs->trans("SeparatorThousand")."x";
+	}
+
+	// Formate nombre
 	if ($html)
 	{
-	
-		$dec='.'; $thousand=' ';
 		return ereg_replace(' ','&nbsp;',number_format($amount, 2, $dec, $thousand));
-	
 	}
 	else
 	{
-		return number_format($amount, 2, '.', ' ');
+		return number_format($amount, 2, $dec, $thousand);
 	}
 }