Fix utf8 encoded twice

This commit is contained in:
Laurent Destailleur 2015-11-28 14:40:23 +01:00
parent eb02b8d944
commit 88e76dcf64
10 changed files with 10 additions and 10 deletions

View File

@ -271,7 +271,7 @@ if ($resql)
if ($sall)
{
foreach($fieldstosearchall as $key => $val) $fieldstosearchall[$key]=$langs->trans($val);
print $langs->trans("FilterOnInto", $sall, join(', ',$fieldstosearchall));
print $langs->trans("FilterOnInto", $all) . join(', ',$fieldstosearchall);
}
if (! empty($moreforfilter))

View File

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

View File

@ -296,7 +296,7 @@ if ($resql)
if ($sall)
{
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 the user can view prospects other than his'

View File

@ -393,7 +393,7 @@ if ($result)
}
if ($search_firstlast_only)
{
print $langs->trans("FilterOnInto", $search_firstlast_only, $langs->trans("Lastname").", ".$langs->trans("Firstname"));
print $langs->trans("FilterOnInto", $search_firstlast_only) . $langs->trans("Lastname").", ".$langs->trans("Firstname");
}
if (! empty($conf->categorie->enabled))

View File

@ -168,7 +168,7 @@ if ($resql)
if ($sall)
{
foreach($fieldstosearchall as $key => $val) $fieldstosearchall[$key]=$langs->trans($val);
print $langs->trans("FilterOnInto", $sall, join(', ',$fieldstosearchall));
print $langs->trans("FilterOnInto", $all) . join(', ',$fieldstosearchall);
}
// If the user can view prospects other than his'

View File

@ -149,7 +149,7 @@ if ($resql)
if ($search_all)
{
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);
}
print "<table class=\"noborder\" width=\"100%\">";

View File

@ -223,7 +223,7 @@ if ($resql)
if ($sall)
{
foreach($fieldstosearchall as $key => $val) $fieldstosearchall[$key]=$langs->trans($val);
print $langs->trans("FilterOnInto", $sall, join(', ',$fieldstosearchall));
print $langs->trans("FilterOnInto", $sall) . join(', ',$fieldstosearchall);
}
print '<table class="noborder" width="100%">';

View File

@ -273,7 +273,7 @@ if ($resql)
if ($search_all)
{
foreach($fieldstosearchall as $key => $val) $fieldstosearchall[$key]=$langs->trans($val);
print $langs->transnoentities("FilterOnInto", $search_all, join(', ',$fieldstosearchall));
print $langs->trans("FilterOnInto", $search_all) . join(', ',$fieldstosearchall);
}
print '<table class="liste" width="100%">';

View File

@ -275,7 +275,7 @@ print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
if ($sall)
{
foreach($fieldstosearchall as $key => $val) $fieldstosearchall[$key]=$langs->trans($val);
print $langs->trans("FilterOnInto", $sall, join(', ',$fieldstosearchall));
print $langs->trans("FilterOnInto", $sall) . join(', ',$fieldstosearchall);
}
print '<table class="noborder" width="100%;">';

View File

@ -263,7 +263,7 @@ if ($result)
if ($sall)
{
foreach($fieldstosearchall as $key => $val) $fieldstosearchall[$key]=$langs->trans($val);
print $langs->trans("FilterOnInto", $sall, join(', ',$fieldstosearchall));
print $langs->trans("FilterOnInto", $sall) . join(', ',$fieldstosearchall);
}
$varpage=empty($contextpage)?$_SERVER["PHP_SELF"]:$contextpage;