From 8f5b575b194501dd6f295ae5576f007fab9ed93e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 30 Jun 2019 16:19:26 +0200
Subject: [PATCH] Fix missing php-intl is not blocking (not working on windows)

---
 build/exe/doliwamp/php.ini.install |  2 ++
 htdocs/core/lib/functions.lib.php  |  2 +-
 htdocs/install/check.php           | 10 +++++-----
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/build/exe/doliwamp/php.ini.install b/build/exe/doliwamp/php.ini.install
index 928e967f184..04191a71f5a 100644
--- a/build/exe/doliwamp/php.ini.install
+++ b/build/exe/doliwamp/php.ini.install
@@ -653,6 +653,8 @@ default_socket_timeout = 60
 ; extension folders as well as the separate PECL DLL download (PHP 5).
 ; Be sure to appropriately set the extension_dir directive.
 
+; If an extension does not load, run  "deplister.exe php_xxx.dll" to get list of dependency dll missing.
+
 extension=php_bz2.dll
 extension=php_curl.dll
 ;extension=php_dba.dll
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 7341bc0c2cb..c930dbf172a 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -7037,7 +7037,7 @@ function getLanguageCodeFromCountryCode($countrycode)
 	$buildprimarykeytotest = strtolower($countrycode).'-'.strtoupper($countrycode);
 	if (in_array($buildprimarykeytotest, $locales)) return strtolower($countrycode).'_'.strtoupper($countrycode);
 
-	if (function_exists('locale_get_primary_language'))    // Need extension php-intl
+	if (function_exists('locale_get_primary_language') && function_exists('locale_get_region'))    // Need extension php-intl
 	{
 	    foreach ($locales as $locale)
     	{
diff --git a/htdocs/install/check.php b/htdocs/install/check.php
index 55331634aff..0b98183904a 100644
--- a/htdocs/install/check.php
+++ b/htdocs/install/check.php
@@ -127,7 +127,7 @@ if (! function_exists("imagecreate"))
 {
 	$langs->load("errors");
 	print '<img src="../theme/eldy/img/warning.png" alt="Error"> '.$langs->trans("ErrorPHPDoesNotSupportGD")."<br>\n";
-	// $checksok=0;		// If image ko, just warning. So check must still be 1 (otherwise no way to install)
+	// $checksok=0;		// If ko, just warning. So check must still be 1 (otherwise no way to install)
 }
 else
 {
@@ -140,7 +140,7 @@ if (! function_exists("curl_init"))
 {
     $langs->load("errors");
     print '<img src="../theme/eldy/img/warning.png" alt="Error"> '.$langs->trans("ErrorPHPDoesNotSupportCurl")."<br>\n";
-    // $checksok=0;		// If image ko, just warning. So check must still be 1 (otherwise no way to install)
+    // $checksok=0;		// If ko, just warning. So check must still be 1 (otherwise no way to install)
 }
 else
 {
@@ -153,7 +153,7 @@ if (! function_exists("utf8_encode"))
 {
 	$langs->load("errors");
 	print '<img src="../theme/eldy/img/warning.png" alt="Error"> '.$langs->trans("ErrorPHPDoesNotSupportUTF8")."<br>\n";
-	// $checksok=0;		// If image ko, just warning. So check must still be 1 (otherwise no way to install)
+	// $checksok=0;		// If ko, just warning. So check must still be 1 (otherwise no way to install)
 }
 else
 {
@@ -162,11 +162,11 @@ else
 
 
 // Check if UTF8 supported
-if (! function_exists("locale_get_primary_language"))
+if (! function_exists("locale_get_primary_language") || ! function_exists("locale_get_region"))
 {
     $langs->load("errors");
     print '<img src="../theme/eldy/img/warning.png" alt="Error"> '.$langs->trans("ErrorPHPDoesNotSupportIntl")."<br>\n";
-    // $checksok=0;		// If image ko, just warning. So check must still be 1 (otherwise no way to install)
+    // $checksok=0;		// If ko, just warning. So check must still be 1 (otherwise no way to install)
 }
 else
 {