From 7e0892783a92bb147e8be6ebe07191071ff6b991 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcos=20Garci=CC=81a?= <marcosgdf@gmail.com>
Date: Mon, 30 Jul 2012 08:21:05 +0200
Subject: [PATCH] Removed duplicated translation and modified a line of code as
 @hregis requested

---
 htdocs/core/lib/admin.lib.php    | 7 +++----
 htdocs/langs/en_US/products.lang | 1 -
 htdocs/langs/es_ES/products.lang | 1 -
 htdocs/langs/fr_FR/products.lang | 1 -
 htdocs/product/popuprop.php      | 5 ++++-
 5 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/htdocs/core/lib/admin.lib.php b/htdocs/core/lib/admin.lib.php
index d05127afc68..c1e6b32ba61 100644
--- a/htdocs/core/lib/admin.lib.php
+++ b/htdocs/core/lib/admin.lib.php
@@ -1045,9 +1045,9 @@ function form_constantes($tableau)
             print '<input type="hidden" name="constname" value="'.$const.'">';
             print '<input type="hidden" name="constnote" value="'.nl2br(dol_escape_htmltag($obj->note)).'">';
 
-            print $langs->trans("Desc$const");
+            print $langs->trans('Desc'.$const);
 
-            if ($const=='ADHERENT_MAILMAN_URL')
+            if ($const == 'ADHERENT_MAILMAN_URL')
             {
                 print '. '.$langs->trans("Example").': <a href="#" id="exampleclick1">'.img_down().'</a><br>';
                 //print 'http://lists.domain.com/cgi-bin/mailman/admin/%LISTE%/members?adminpw=%MAILMAN_ADMINPW%&subscribees=%EMAIL%&send_welcome_msg_to_this_batch=1';
@@ -1055,7 +1055,7 @@ function form_constantes($tableau)
                 print 'http://lists.domain.com/cgi-bin/mailman/admin/%LISTE%/members/add?subscribees_upload=%EMAIL%&amp;adminpw=%MAILMAN_ADMINPW%&amp;subscribe_or_invite=0&amp;send_welcome_msg_to_this_batch=0&amp;notification_to_list_owner=0';
                 print '</div>';
             }
-            if ($const=='ADHERENT_MAILMAN_UNSUB_URL')
+            if ($const == 'ADHERENT_MAILMAN_UNSUB_URL')
             {
                 print '. '.$langs->trans("Example").': <a href="#" id="exampleclick2">'.img_down().'</a><br>';
                 print '<div id="example2" class="hidden">';
@@ -1064,7 +1064,6 @@ function form_constantes($tableau)
                 //print 'http://lists.domain.com/cgi-bin/mailman/admin/%LISTE%/members/remove?adminpw=%MAILMAN_ADMINPW%&unsubscribees=%EMAIL%';
             }
 
-
             print "</td>\n";
 
             if ($const == 'ADHERENT_CARD_TYPE' || $const == 'ADHERENT_ETIQUETTE_TYPE')
diff --git a/htdocs/langs/en_US/products.lang b/htdocs/langs/en_US/products.lang
index 6a08b3106d4..7c6a28231dc 100644
--- a/htdocs/langs/en_US/products.lang
+++ b/htdocs/langs/en_US/products.lang
@@ -156,7 +156,6 @@ ServiceNb=Service #%s
 ListProductServiceByPopularity=List of products/services by popularity
 ListProductByPopularity=List of products by popularity
 ListServiceByPopularity=List of services by popularity
-NbProposals=No. of proposals
 Finished=Manufactured product
 RowMaterial=First material
 CloneProduct=Clone product or service
diff --git a/htdocs/langs/es_ES/products.lang b/htdocs/langs/es_ES/products.lang
index 028aab4bb85..de602fe94f9 100644
--- a/htdocs/langs/es_ES/products.lang
+++ b/htdocs/langs/es_ES/products.lang
@@ -156,7 +156,6 @@ ServiceNb=Servicio no %s
 ListProductServiceByPopularity=Listado de productos/servicios por popularidad
 ListProductByPopularity=Listado de productos/servicios por popularidad
 ListServiceByPopularity=Listado de servicios por popularidad
-NbProposals=Nº de presupuestos
 Finished=Producto manufacturado
 RowMaterial=Materia prima
 CloneProduct=Clonar producto/servicio
diff --git a/htdocs/langs/fr_FR/products.lang b/htdocs/langs/fr_FR/products.lang
index c17e97f93bc..2d3dfd12b2d 100644
--- a/htdocs/langs/fr_FR/products.lang
+++ b/htdocs/langs/fr_FR/products.lang
@@ -156,7 +156,6 @@ ServiceNb=Service no %s
 ListProductServiceByPopularity=Liste des produits/services par popularité
 ListProductByPopularity=Liste des produits par popularité
 ListServiceByPopularity=Liste des services par popularité
-NbProposals=Nb. de proposition
 Finished=Produit manufacturé
 RowMaterial=Matière première
 CloneProduct=Cloner produit/service
diff --git a/htdocs/product/popuprop.php b/htdocs/product/popuprop.php
index e7390f06a19..54067a5b9d0 100644
--- a/htdocs/product/popuprop.php
+++ b/htdocs/product/popuprop.php
@@ -27,6 +27,9 @@
 require("../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT.'/product/class/product.class.php');
 
+//Required to translate NbOfProposals
+$langs->load('propal');
+
 $type=GETPOST("type","int");
 
 // Security check
@@ -95,7 +98,7 @@ print "<tr class=\"liste_titre\">";
 print_liste_field_titre($langs->trans('Ref'), 'popuprop.php', 'p.ref', '', '', '', $sortfield, $sortorder);
 print_liste_field_titre($langs->trans('Type'), 'popuprop.php', 'p.type', '', '', '', $sortfield, $sortorder);
 print_liste_field_titre($langs->trans('Label'), 'popuprop.php', 'p.label', '', '', '', $sortfield, $sortorder);
-print_liste_field_titre($langs->trans('NbProposals'), 'popuprop.php', 'c', '', '', 'align="right"', $sortfield, $sortorder);
+print_liste_field_titre($langs->trans('NbOfProposals'), 'popuprop.php', 'c', '', '', 'align="right"', $sortfield, $sortorder);
 print "</tr>\n";
 
 $sql  = "SELECT p.rowid, p.label, p.ref, p.fk_product_type as type, count(*) as c";