[-] BO: Fix localization pack url
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14947 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
@@ -147,7 +147,7 @@ class AdminLocalizationControllerCore extends AdminController
|
|||||||
$version = str_replace('.', '', _PS_VERSION_);
|
$version = str_replace('.', '', _PS_VERSION_);
|
||||||
$version = substr($version, 0, 2);
|
$version = substr($version, 0, 2);
|
||||||
|
|
||||||
$pack = @Tools::file_get_contents('http://api.prestashop.com/download/localization/'.$version.'/'.Tools::getValue('iso_localization_pack').'.xml');
|
$pack = @Tools::file_get_contents('http://api.prestashop.com/localization/'.$version.'/'.Tools::getValue('iso_localization_pack').'.xml');
|
||||||
|
|
||||||
if (!$pack && !($pack = @Tools::file_get_contents(dirname(__FILE__).'/../../localization/'.Tools::getValue('iso_localization_pack').'.xml')))
|
if (!$pack && !($pack = @Tools::file_get_contents(dirname(__FILE__).'/../../localization/'.Tools::getValue('iso_localization_pack').'.xml')))
|
||||||
$this->errors[] = Tools::displayError('Cannot load localization pack (from prestashop.com and from your local folder "localization")');
|
$this->errors[] = Tools::displayError('Cannot load localization pack (from prestashop.com and from your local folder "localization")');
|
||||||
|
|||||||
@@ -426,7 +426,7 @@ class InstallModelInstall extends InstallAbstractModel
|
|||||||
$version = str_replace('.', '', _PS_VERSION_);
|
$version = str_replace('.', '', _PS_VERSION_);
|
||||||
$version = substr($version, 0, 2);
|
$version = substr($version, 0, 2);
|
||||||
|
|
||||||
$localization_file_content = @Tools::file_get_contents('http://api.prestashop.com/download/localization/'.$version.'/'.$data['shop_country'].'.xml');
|
$localization_file_content = @Tools::file_get_contents('http://api.prestashop.com/localization/'.$version.'/'.$data['shop_country'].'.xml');
|
||||||
if (!$localization_file_content)
|
if (!$localization_file_content)
|
||||||
{
|
{
|
||||||
$localization_file = _PS_ROOT_DIR_.'/localization/default.xml';
|
$localization_file = _PS_ROOT_DIR_.'/localization/default.xml';
|
||||||
|
|||||||
Reference in New Issue
Block a user