Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-15 14:01:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	htdocs/comm/card.php
	htdocs/core/modules/mailings/xinputfile.modules.php
	htdocs/fourn/facture/card.php
This commit is contained in:
Laurent Destailleur
2019-03-02 19:13:37 +01:00
parent a5711a51ab 40e923ec85
commit 8fce6e5e31
10 changed files with 77 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -6831,7 +6831,8 @@ function picto_from_langcode($codelang, $moreatt = '')
}
/**
* Return default language from country code
* Return default language from country code.
* Return null if not found.
*
* @param string $countrycode Country code like 'US', 'FR', 'CA', ...
* @return string Value of locale like 'en_US', 'fr_FR', ...
@@ -6840,6 +6841,8 @@ function getLanguageCodeFromCountryCode($countrycode)
{
global $mysoc;
if (empty($countrycode)) return null;
if (strtoupper($countrycode) == 'MQ') return 'fr_CA';
if (strtoupper($countrycode) == 'SE') return 'sv_SE'; // se_SE is Sami/Sweden, and we want in priority sv_SE for SE country
if (strtoupper($countrycode) == 'CH')