From 700b5872ab70bd8a801e2e6940357024135b689e Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis@dolibarr.fr>
Date: Tue, 4 Sep 2007 22:22:14 +0000
Subject: [PATCH] Fix: traduction

---
 htdocs/html.form.class.php     | 14 ++++++++++++--
 htdocs/langs/en_US/stocks.lang |  1 +
 htdocs/langs/fr_FR/stocks.lang |  1 +
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/htdocs/html.form.class.php b/htdocs/html.form.class.php
index ce92d3a9ac6..2a44da64a10 100644
--- a/htdocs/html.form.class.php
+++ b/htdocs/html.form.class.php
@@ -1143,6 +1143,8 @@ class Form
 	{
 		global $langs,$conf;
 		
+		$langs->load('stocks');
+		
 		$sql = "SELECT p.rowid, p.label, p.ref, p.price, p.duration,";
 		$sql.= " pf.ref_fourn, pfp.rowid as idprodfournprice, pfp.price as fprice, pfp.quantity, pfp.unitprice";
 		$sql.= " FROM ".MAIN_DB_PREFIX."product as p";
@@ -1196,11 +1198,19 @@ class Form
 				if ($objp->fprice != '') 
 				{
 					$opt.= price($objp->fprice);
-					$opt.= $langs->trans("Currency".$conf->monnaie)."/".$objp->quantity.$langs->trans("Units");
+					$opt.= $langs->trans("Currency".$conf->monnaie)."/".$objp->quantity;
+					if ($objp->quantity == 1)
+					{
+						$opt.= strtolower($langs->trans("Unit"));
+					}
+					else
+					{
+						$opt.= strtolower($langs->trans("Units"));
+					}
 					if ($objp->quantity > 1)
 					{
 						$opt.=" - ";
-						$opt.= price($objp->unitprice).$langs->trans("Currency".$conf->monnaie)."/".$langs->trans("Unit");
+						$opt.= price($objp->unitprice).$langs->trans("Currency".$conf->monnaie)."/".strtolower($langs->trans("Unit"));
 					}
 					if ($objp->duration) $opt .= " - ".$objp->duration;
 				}
diff --git a/htdocs/langs/en_US/stocks.lang b/htdocs/langs/en_US/stocks.lang
index 8a721687f3c..66fcae5fad7 100644
--- a/htdocs/langs/en_US/stocks.lang
+++ b/htdocs/langs/en_US/stocks.lang
@@ -26,6 +26,7 @@ NumberOfProducts=Total number of products
 LastMovement=Last movement
 LastMovements=Last movements
 Units=Units
+Unit=Unit
 StockCorrection=Stock correction
 StockMovement=Transfer
 StockMovements=Stock transfers
diff --git a/htdocs/langs/fr_FR/stocks.lang b/htdocs/langs/fr_FR/stocks.lang
index b0e87e7c7bf..1aaf5f2f349 100644
--- a/htdocs/langs/fr_FR/stocks.lang
+++ b/htdocs/langs/fr_FR/stocks.lang
@@ -26,6 +26,7 @@ NumberOfProducts=Nombre total de produits
 LastMovement=Dernier mouvement
 LastMovements=Derniers mouvements
 Units=Unités
+Unit=Unité
 StockCorrection=Correction stock
 StockMovement=Transfert
 StockMovements=Mouvements de stock