New: Add logo of country "near" language in setup pages.

htdocs/admin/ihm.php

@@ -27,6 +27,7 @@
 require("./pre.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/usergroups.lib.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php");
+require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php");
 require_once(DOL_DOCUMENT_ROOT."/html.formadmin.class.php");
 
 $langs->load("admin");
@@ -303,7 +304,11 @@ else	// Show
     print '<tr class="liste_titre"><td>'.$langs->trans("Parameter").'</td><td>'.$langs->trans("Value").'</td><td>&nbsp;</td></tr>';
 
     $var=!$var;
-    print '<tr '.$bc[$var].'><td width="35%">'.$langs->trans("DefaultLanguage").'</td><td>' . ($conf->global->MAIN_LANG_DEFAULT=='auto'?$langs->trans("AutoDetectLang"):$langs->trans("Language_".$conf->global->MAIN_LANG_DEFAULT)) . '</td>';
+    print '<tr '.$bc[$var].'><td width="35%">'.$langs->trans("DefaultLanguage").'</td><td>';
+    $s=picto_from_langcode($conf->global->MAIN_LANG_DEFAULT);
+    print ($s?$s.' ':'');
+    print ($conf->global->MAIN_LANG_DEFAULT=='auto'?$langs->trans("AutoDetectLang"):$langs->trans("Language_".$conf->global->MAIN_LANG_DEFAULT));
+    print '</td>';
 	print '<td width="20">&nbsp;</td>';
 	print "</tr>";
 

htdocs/lib/functions2.lib.php

@@ -982,3 +982,30 @@ function version_webserver()
 {
 	return $_SERVER["SERVER_SOFTWARE"];
 }
+
+
+/**
+ * 	\brief		Show picto of country for a language code
+ * 	\return		string
+ */
+function picto_from_langcode($codelang)
+{
+	$ret='';
+    if (! empty($codelang))
+    {
+    	if ($codelang == 'auto') $ret=img_picto('','/theme/common/flags/int.png','',1);
+    	else {
+    		//print $codelang;
+    		$langtocountryflag=array('fr_CA'=>'mq','es_CA','catalonia','ar_AR'=>'');
+    		$tmpcode='';
+    		if (isset($langtocountryflag[$codelang])) $tmpcode=$langtocountryflag[$codelang];
+    		else
+    		{
+    			$tmparray=explode('_',$codelang);
+    			$tmpcode=$tmparray[1];
+    		}
+    		if ($tmpcode) $ret.=img_picto($codelang,'/theme/common/flags/'.strtolower($tmpcode).'.png','',1);
+    	}
+    }
+    return $ret;
+}

htdocs/user/param_ihm.php

@@ -1,5 +1,5 @@
 <?php
-/* Copyright (C) 2005-2009 Laurent Destailleur  <eldy@users.sourceforge.net>
+/* Copyright (C) 2005-2010 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2010      Regis Houssin        <regis@dolibarr.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -19,7 +19,7 @@
 
 /**
  *       \file       htdocs/user/param_ihm.php
- *       \brief      Onglet parametrage de la fiche utilisateur
+ *       \brief      Page to show user setup for display
  *       \version    $Id$
  */
 
@@ -166,7 +166,10 @@ if ($_GET["action"] == 'edit')
     // Langue par defaut
     $var=!$var;
     print '<tr '.$bc[$var].'><td>'.$langs->trans("Language").'</td>';
-    print '<td>'.($conf->global->MAIN_LANG_DEFAULT=='auto'?$langs->trans("AutoDetectLang"):$langs->trans("Language_".$conf->global->MAIN_LANG_DEFAULT)).'</td>';
+    print '<td>';
+    print picto_from_langcode($conf->global->MAIN_LANG_DEFAULT);
+    print ($conf->global->MAIN_LANG_DEFAULT=='auto'?$langs->trans("AutoDetectLang"):$langs->trans("Language_".$conf->global->MAIN_LANG_DEFAULT));
+    print '</td>';
     print '<td align="left" nowrap="nowrap" width="20%"><input '.$bc[$var].' name="check_MAIN_LANG_DEFAULT" type="checkbox" '.($fuser->conf->MAIN_LANG_DEFAULT?" checked":"");
     print ! empty($dolibarr_main_demo)?' disabled="true"':'';	// Disabled for demo
     print '> '.$langs->trans("UsePersonalValue").'</td>';
@@ -208,9 +211,17 @@ else
 
     $var=!$var;
     print '<tr '.$bc[$var].'><td>'.$langs->trans("Language").'</td>';
-    print '<td>'.($conf->global->MAIN_LANG_DEFAULT=='auto'?$langs->trans("AutoDetectLang"):$langs->trans("Language_".$conf->global->MAIN_LANG_DEFAULT)).'</td>';
+    print '<td>';
+    $s=picto_from_langcode($conf->global->MAIN_LANG_DEFAULT);
+    print ($s?$s.' ':'');
+    print ($conf->global->MAIN_LANG_DEFAULT=='auto'?$langs->trans("AutoDetectLang"):$langs->trans("Language_".$conf->global->MAIN_LANG_DEFAULT));
+    print '</td>';
     print '<td align="left" nowrap="nowrap" width="20%"><input '.$bc[$var].' type="checkbox" disabled '.($fuser->conf->MAIN_LANG_DEFAULT?" checked":"").'> '.$langs->trans("UsePersonalValue").'</td>';
-    print '<td>'.($fuser->conf->MAIN_LANG_DEFAULT=='auto'?$langs->trans("AutoDetectLang"):($fuser->conf->MAIN_LANG_DEFAULT?$langs->trans("Language_".$fuser->conf->MAIN_LANG_DEFAULT):'')).'</td></tr>';
+    print '<td>';
+    $s=picto_from_langcode($fuser->conf->MAIN_LANG_DEFAULT);
+    print ($s?$s.' ':'');
+    print ($fuser->conf->MAIN_LANG_DEFAULT=='auto'?$langs->trans("AutoDetectLang"):($fuser->conf->MAIN_LANG_DEFAULT?$langs->trans("Language_".$fuser->conf->MAIN_LANG_DEFAULT):''));
+    print '</td></tr>';
 
     $var=!$var;
     print '<tr '.$bc[$var].'><td>'.$langs->trans("MaxSizeList").'</td>';