From 61c211c6390f7fdf2ba1fbbaa2526bf4c5f5be6e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcos=20Garci=CC=81a?= <marcosgdf@gmail.com>
Date: Fri, 3 Aug 2012 15:47:09 +0200
Subject: [PATCH] Improved readability in picto_from_langcode

---
 htdocs/core/lib/functions.lib.php | 38 +++++++++++++++++++------------
 1 file changed, 24 insertions(+), 14 deletions(-)

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 2f96ae17074..b87c8a55ce1 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -3863,24 +3863,34 @@ function dol_validElement($element)
  */
 function picto_from_langcode($codelang)
 {
-    $ret='';
+    global $langs;
+
     if (! empty($codelang))
     {
-        if ($codelang == 'auto') $ret=img_picto('',DOL_URL_ROOT.'/theme/common/flags/int.png','',1);
-        else {
-            //print $codelang;
-            $langtocountryflag=array('ar_AR'=>'','ca_ES'=>'catalonia','da_DA'=>'dk','fr_CA'=>'mq','sv_SV'=>'se');
-            $tmpcode='';
-            if (isset($langtocountryflag[$codelang])) $tmpcode=$langtocountryflag[$codelang];
-            else
-            {
-                $tmparray=explode('_',$codelang);
-                $tmpcode=empty($tmparray[1])?$tmparray[0]:$tmparray[1];
-            }
-            if ($tmpcode) $ret.=img_picto($codelang,DOL_URL_ROOT.'/theme/common/flags/'.strtolower($tmpcode).'.png','',1);
+        if ($codelang == 'auto')
+        {
+            return img_picto_common($langs->trans('AutoDetectLang'), 'flags/int.png');
         }
+
+        $langtocountryflag = array(
+            'ar_AR' => '',
+            'ca_ES' => 'catalonia',
+            'da_DA' => 'dk',
+            'fr_CA' => 'mq',
+            'sv_SV' => 'se'
+        );
+
+        if (isset($langtocountryflag[$codelang])) $tmpcode = $langtocountryflag[$codelang];
+        else
+        {
+            $tmparray = explode('_', $codelang);
+            $tmpcode = empty($tmparray[1]) ? $tmparray[0] : $tmparray[1];
+        }
+
+        if (isset($tmpcode)) return img_picto_common($codelang, 'flags/'.strtolower($tmpcode).'.png');
     }
-    return $ret;
+
+    return '';
 }
 
 /**