From 88e76dcf64a895e0ceae27da0bac3990b1b4bbd3 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 28 Nov 2015 14:40:23 +0100 Subject: [PATCH] Fix utf8 encoded twice --- dev/skeletons/skeleton_list.php | 2 +- htdocs/commande/list.php | 2 +- htdocs/compta/facture/list.php | 2 +- htdocs/contact/list.php | 2 +- htdocs/contrat/list.php | 2 +- htdocs/don/list.php | 2 +- htdocs/fourn/commande/list.php | 2 +- htdocs/fourn/facture/list.php | 2 +- htdocs/holiday/list.php | 2 +- htdocs/user/index.php | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dev/skeletons/skeleton_list.php b/dev/skeletons/skeleton_list.php index 686549f19a8..dec170ae169 100644 --- a/dev/skeletons/skeleton_list.php +++ b/dev/skeletons/skeleton_list.php @@ -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)) diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php index fa695dbaa50..a257d808131 100644 --- a/htdocs/commande/list.php +++ b/htdocs/commande/list.php @@ -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=''; diff --git a/htdocs/compta/facture/list.php b/htdocs/compta/facture/list.php index e7d90118d12..9372f50f4aa 100644 --- a/htdocs/compta/facture/list.php +++ b/htdocs/compta/facture/list.php @@ -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' diff --git a/htdocs/contact/list.php b/htdocs/contact/list.php index d10e34227d6..dc2734b28a1 100644 --- a/htdocs/contact/list.php +++ b/htdocs/contact/list.php @@ -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)) diff --git a/htdocs/contrat/list.php b/htdocs/contrat/list.php index 6d16e051327..dbf5803a4c6 100644 --- a/htdocs/contrat/list.php +++ b/htdocs/contrat/list.php @@ -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' diff --git a/htdocs/don/list.php b/htdocs/don/list.php index 14389887faa..36c74826952 100644 --- a/htdocs/don/list.php +++ b/htdocs/don/list.php @@ -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 ""; diff --git a/htdocs/fourn/commande/list.php b/htdocs/fourn/commande/list.php index dea0f72b628..e7e83242ec7 100644 --- a/htdocs/fourn/commande/list.php +++ b/htdocs/fourn/commande/list.php @@ -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 '
'; diff --git a/htdocs/fourn/facture/list.php b/htdocs/fourn/facture/list.php index a46c5e6ca38..6b69adceb3e 100644 --- a/htdocs/fourn/facture/list.php +++ b/htdocs/fourn/facture/list.php @@ -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 '
'; diff --git a/htdocs/holiday/list.php b/htdocs/holiday/list.php index 2f008e5ccd1..5c6829734af 100644 --- a/htdocs/holiday/list.php +++ b/htdocs/holiday/list.php @@ -275,7 +275,7 @@ print ''; 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 '
'; diff --git a/htdocs/user/index.php b/htdocs/user/index.php index 5961d03246e..ce597483d76 100644 --- a/htdocs/user/index.php +++ b/htdocs/user/index.php @@ -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;