From 0e108226daa3b59bcaf6f59cd53541b59179088f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcos=20Garci=CC=81a?= Date: Fri, 3 Aug 2012 14:05:28 +0200 Subject: [PATCH 1/4] FeatureNotYetAvailable wasn't being translated --- htdocs/comm/prospect/recap-prospect.php | 1 + 1 file changed, 1 insertion(+) diff --git a/htdocs/comm/prospect/recap-prospect.php b/htdocs/comm/prospect/recap-prospect.php index 32347362e09..a478ce54ecd 100644 --- a/htdocs/comm/prospect/recap-prospect.php +++ b/htdocs/comm/prospect/recap-prospect.php @@ -27,6 +27,7 @@ require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php"); require_once(DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php"); $langs->load("companies"); +$langs->load('other'); if ($conf->facture->enabled) $langs->load("bills"); // Security check From 5b8e8ff11b52e37d8dda4a3ee33e016284dce780 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcos=20Garci=CC=81a?= Date: Fri, 3 Aug 2012 14:24:02 +0200 Subject: [PATCH 2/4] ECM Area page title translation didn't exist --- htdocs/ecm/index.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/ecm/index.php b/htdocs/ecm/index.php index 42c64adf2a9..290e3610625 100644 --- a/htdocs/ecm/index.php +++ b/htdocs/ecm/index.php @@ -361,7 +361,7 @@ $moreheadjs=empty($conf->use_javascript_ajax)?"":" }); "; -llxHeader($moreheadcss.$moreheadjs,$langs->trans("ECM"),'','','','',$morejs,'',0,0); +llxHeader($moreheadcss.$moreheadjs,$langs->trans("ECMArea"),'','','','',$morejs,'',0,0); // Add sections to manage From f700f63494aeb718e722169e3518752a11a610eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcos=20Garci=CC=81a?= Date: Fri, 3 Aug 2012 14:30:11 +0200 Subject: [PATCH 3/4] Little refactor + cpd --- htdocs/core/lib/functions.lib.php | 29 ++++++++++++++++------------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php index f58b1e0db19..4dc8665907f 100644 --- a/htdocs/core/lib/functions.lib.php +++ b/htdocs/core/lib/functions.lib.php @@ -2048,22 +2048,25 @@ function img_mime($file, $alt = '') } -/** +/** * Show phone logo. * Use img_picto instead. - * - * @param string $alt Text to show on alt image - * @param int $option Option + * + * @param string $alt Text to show on alt image + * @param int $option Option * @return string Return img tag - * @deprecated - */ -function img_phone($alt = "default",$option=0) -{ - global $conf,$langs; - if ($alt=="default") $alt=$langs->trans("Call"); - $img='call_out'; - if ($option == 1) $img='call'; - return ''.dol_escape_htmltag($alt).''; + * @deprecated + */ +function img_phone($alt = 'default', $option = 0) +{ + global $conf,$langs; + + if ($alt == 'default') $alt = $langs->trans('Call'); + + if ($option == 1) $img = 'call'; + else $img = 'call_out'; + + return img_picto($alt, $img); } From d30b2804bcb315e54d0c5ada988fb026655a91e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcos=20Garci=CC=81a?= Date: Fri, 3 Aug 2012 14:31:10 +0200 Subject: [PATCH 4/4] Was using tabs instead of spaces --- htdocs/core/lib/functions.lib.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php index 4dc8665907f..d3ecab9ee48 100644 --- a/htdocs/core/lib/functions.lib.php +++ b/htdocs/core/lib/functions.lib.php @@ -2063,7 +2063,7 @@ function img_phone($alt = 'default', $option = 0) if ($alt == 'default') $alt = $langs->trans('Call'); - if ($option == 1) $img = 'call'; + if ($option == 1) $img = 'call'; else $img = 'call_out'; return img_picto($alt, $img);