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

Merge pull request #3846 from frederic34/patch-21

Browse Source 
Correction double translation which give bad html display
This commit is contained in:
Laurent Destailleur 2015-11-02 11:29:04 +01:00
commit 1ee9594e38
6 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/adherents/list.php
View File

@ -202,7 +202,7 @@ if ($resql)
if ($sall) if ($sall)
{ {
foreach($fieldstosearchall as $key => $val) $fieldstosearchall[$key]=$langs->trans($val); foreach($fieldstosearchall as $key => $val) $fieldstosearchall[$key]=$langs->trans($val);
print $langs->trans("FilterOnInto", $sall, join(', ',$fieldstosearchall)); print $langs->trans("FilterOnInto", $sall) . join(', ',$fieldstosearchall);
} }
// Filter on categories // Filter on categories

2
htdocs/comm/propal/list.php
View File

@ -281,7 +281,7 @@ if ($result)
{ {
foreach($fieldstosearchall as $key => $val) $fieldstosearchall[$key]=$langs->trans($val); foreach($fieldstosearchall as $key => $val) $fieldstosearchall[$key]=$langs->trans($val);
//sort($fieldstosearchall); //sort($fieldstosearchall);
print $langs->trans("FilterOnInto", $sall, join(', ',$fieldstosearchall)); print $langs->trans("FilterOnInto", $sall) . join(', ',$fieldstosearchall);
} }
$i = 0; $i = 0;

2
htdocs/contact/list.php
View File

@ -287,7 +287,7 @@ if ($result)
if ($sall) if ($sall)
{ {
foreach($fieldstosearchall as $key => $val) $fieldstosearchall[$key]=$langs->trans($val); foreach($fieldstosearchall as $key => $val) $fieldstosearchall[$key]=$langs->trans($val);
print $langs->trans("FilterOnInto", $sall, join(', ',$fieldstosearchall)); print $langs->trans("FilterOnInto", $sall) . join(', ',$fieldstosearchall);
} }
if ($search_firstlast_only) if ($search_firstlast_only)
{ {

2
htdocs/product/list.php
View File

@ -333,7 +333,7 @@ else
if ($sall) if ($sall)
{ {
foreach($fieldstosearchall as $key => $val) $fieldstosearchall[$key]=$langs->trans($val); foreach($fieldstosearchall as $key => $val) $fieldstosearchall[$key]=$langs->trans($val);
print $langs->trans("FilterOnInto", $sall, join(', ',$fieldstosearchall)); print $langs->trans("FilterOnInto", $sall) . join(', ',$fieldstosearchall);
} }
// Filter on categories // Filter on categories

2
htdocs/projet/list.php
View File

@ -259,7 +259,7 @@ if ($resql)
if ($search_all) if ($search_all)
{ {
foreach($fieldstosearchall as $key => $val) $fieldstosearchall[$key]=$langs->trans($val); foreach($fieldstosearchall as $key => $val) $fieldstosearchall[$key]=$langs->trans($val);
print $langs->trans("FilterOnInto", $search_all, join(', ',$fieldstosearchall)); print $langs->trans("FilterOnInto", $search_all) . join(', ',$fieldstosearchall);
} }
$colspan=8; $colspan=8;

2
htdocs/societe/list.php
View File

@ -445,7 +445,7 @@ if ($resql)
if ($search_all) if ($search_all)
{ {
foreach($fieldstosearchall as $key => $val) $fieldstosearchall[$key]=$langs->trans($val); foreach($fieldstosearchall as $key => $val) $fieldstosearchall[$key]=$langs->trans($val);
print $langs->trans("FilterOnInto", $search_all, join(', ',$fieldstosearchall)); print $langs->trans("FilterOnInto", $search_all) . join(', ',$fieldstosearchall);
} }
// Filter on categories // Filter on categories