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

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

Browse Source
This commit is contained in:
Laurent Destailleur
2019-04-03 18:52:47 +02:00
parent 76dcbf7424 9e5d87e821
commit 1f00e24abc
1 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -7012,15 +7012,22 @@ function getLanguageCodeFromCountryCode($countrycode)
$buildprimarykeytotest = strtolower($countrycode).'-'.strtoupper($countrycode); $buildprimarykeytotest = strtolower($countrycode).'-'.strtoupper($countrycode);
if (in_array($buildprimarykeytotest, $locales)) return strtolower($countrycode).'_'.strtoupper($countrycode); if (in_array($buildprimarykeytotest, $locales)) return strtolower($countrycode).'_'.strtoupper($countrycode);
foreach ($locales as $locale) if (function_exists('locale_get_primary_language')) // Need extension php-intl
{ {
$locale_language = locale_get_primary_language($locale); foreach ($locales as $locale)
$locale_region = locale_get_region($locale); {
if (strtoupper($countrycode) == $locale_region) $locale_language = locale_get_primary_language($locale);
{ $locale_region = locale_get_region($locale);
//var_dump($locale.'-'.$locale_language.'-'.$locale_region); if (strtoupper($countrycode) == $locale_region)
return strtolower($locale_language).'_'.strtoupper($locale_region); {
} //var_dump($locale.'-'.$locale_language.'-'.$locale_region);
return strtolower($locale_language).'_'.strtoupper($locale_region);
}
}
}
else
{
dol_syslog("Warning Exention php-intl is not available", LOG_WARNING);
} }
return null; return null;