Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop

Browse Source
This commit is contained in:
Laurent Destailleur
2018-01-30 18:03:26 +01:00
parent f761c9efab 6fb90682cf
commit bbcc1e54d5
15 changed files with 380 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/core/lib/functions.lib.php
View File

@@ -6310,7 +6310,7 @@ function dol_validElement($element)
* Return img flag of country for a language code or country code
*
* @param string $codelang Language code (en_IN, fr_CA...) or Country code (IN, FR)
* @param string $moreatt Add more attribute on img tag (For example 'style="float: right"')
* @param string $moreatt Add more attribute on img tag (For example 'style="float: right"')
* @return string HTML img string with flag.
*/
function picto_from_langcode($codelang, $moreatt = '')
@@ -6323,7 +6323,7 @@ function picto_from_langcode($codelang, $moreatt = '')
if ($codelang == 'auto')
{
return img_picto_common($langs->trans('AutoDetectLang'), 'flags/int.png', $moreatt);
return '<span class="fa fa-globe"></span>';
}
$langtocountryflag = array(