dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Better regexp to get country browser from HTTP_ACCEPT_LANGUAGE

Browse Source 
With HTTP_ACCEPT_LANGUAGE we have two choices :
* Country == language (displayed with two letter as fr,de,en,...)
* Country with multi language (displayes as fr-CH, de-CH, it-CH)

Previous regexp find only first case.
This commit is contained in:
cam.lafit
2013-06-10 11:00:49 +02:00
parent a73326bfb2
commit 663ec76bb9
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
controllers/front/AddressController.php
+3 -1
View File
@@ -303,7 +303,9 @@ class AddressControllerCore extends FrontController
$selected_country = (int)$this->_address->id_country; $selected_country = (int)$this->_address->id_country;
else if (isset($_SERVER['HTTP_ACCEPT_LANGUAGE'])) else if (isset($_SERVER['HTTP_ACCEPT_LANGUAGE']))
{ {
$array = preg_split('/,|-/', $_SERVER['HTTP_ACCEPT_LANGUAGE']); // get all countries as language (xy) or language-country (wz-XY)
$array = array();
preg_match("#(?<=-)\w\w|\w\w(?!-)#",$_SERVER['HTTP_ACCEPT_LANGUAGE'],$array);
if (!Validate::isLanguageIsoCode($array[0]) || !($selected_country = Country::getByIso($array[0]))) if (!Validate::isLanguageIsoCode($array[0]) || !($selected_country = Country::getByIso($array[0])))
$selected_country = (int)Configuration::get('PS_COUNTRY_DEFAULT'); $selected_country = (int)Configuration::get('PS_COUNTRY_DEFAULT');
} }
controllers/front/AuthController.php
+3 -1
View File
@@ -107,7 +107,9 @@ class AuthControllerCore extends FrontController
if (isset($_SERVER['HTTP_ACCEPT_LANGUAGE'])) if (isset($_SERVER['HTTP_ACCEPT_LANGUAGE']))
{ {
$array = preg_split('/,|-/', $_SERVER['HTTP_ACCEPT_LANGUAGE']); // get all countries as language (xy) or language-country (wz-XY)
$array = array();
preg_match("#(?<=-)\w\w|\w\w(?!-)#",$_SERVER['HTTP_ACCEPT_LANGUAGE'],$array);
if (!Validate::isLanguageIsoCode($array[0]) || !($sl_country = Country::getByIso($array[0]))) if (!Validate::isLanguageIsoCode($array[0]) || !($sl_country = Country::getByIso($array[0])))
$sl_country = (int)Configuration::get('PS_COUNTRY_DEFAULT'); $sl_country = (int)Configuration::get('PS_COUNTRY_DEFAULT');
} }