lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Removed duplicated translation and modified a line of code as @hregis requested

Browse Source
This commit is contained in:
Marcos García 2012-07-30 08:21:05 +02:00
parent c627e73c9d
commit 7e0892783a
5 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
htdocs/core/lib/admin.lib.php
View File

@ -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')

1
htdocs/langs/en_US/products.lang
View File

@ -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

1
htdocs/langs/es_ES/products.lang
View File

@ -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

1
htdocs/langs/fr_FR/products.lang
View File

@ -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

5
htdocs/product/popuprop.php
View File

@ -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";