From db989ce7d7ac005a39fd13cbd99e1e607ea74396 Mon Sep 17 00:00:00 2001 From: fBrignoli Date: Thu, 5 Jan 2012 14:58:05 +0000 Subject: [PATCH] [*] LO : 1.5 Localization Pack git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12197 b9a71923-0436-4b27-9f14-aed3839534dd --- .../admin/AdminLocalizationController.php | 9 +++++++-- install-new/models/install.php | 17 +++++++++++++---- 2 files changed, 20 insertions(+), 6 deletions(-) diff --git a/controllers/admin/AdminLocalizationController.php b/controllers/admin/AdminLocalizationController.php index dc5c829c2..2881b8fb6 100644 --- a/controllers/admin/AdminLocalizationController.php +++ b/controllers/admin/AdminLocalizationController.php @@ -99,9 +99,14 @@ class AdminLocalizationControllerCore extends AdminController { if (Tools::isSubmit('submitLocalizationPack')) { - $pack = @Tools::file_get_contents('http://api.prestashop.com/download/localization/'.Tools::getValue('iso_localization_pack').'.xml'); - if (!$pack || !($pack = @Tools::file_get_contents(dirname(__FILE__).'/../../localization/'.Tools::getValue('iso_localization_pack').'.xml'))) + $version = str_replace('.', '', _PS_VERSION_); + $version = substr($version, 0, 2); + + $pack = @Tools::file_get_contents('http://api.prestashop.com/download/localization/'.$version.'/'.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")'); + if (!$selection = Tools::getValue('selection')) $this->_errors[] = Tools::displayError('Please select at least one content item to import.'); else diff --git a/install-new/models/install.php b/install-new/models/install.php index 214e4a153..8dc7a0da0 100644 --- a/install-new/models/install.php +++ b/install-new/models/install.php @@ -377,12 +377,21 @@ class InstallModelInstall extends InstallAbstractModel } // Set localization configuration - $localization_file = _PS_ROOT_DIR_.'/localization/default.xml'; - if (file_exists(_PS_ROOT_DIR_.'/localization/'.$data['shop_country'].'.xml')) - $localization_file = _PS_ROOT_DIR_.'/localization/'.$data['shop_country'].'.xml'; + $version = str_replace('.', '', _PS_VERSION_); + $version = substr($version, 0, 2); + + $localization_file_content = @Tools::file_get_contents('http://api.prestashop.com/download/localization/'.$version.'/'.$data['shop_country'].'.xml'); + if (!$localization_file_content) + { + $localization_file = _PS_ROOT_DIR_.'/localization/default.xml'; + if (file_exists(_PS_ROOT_DIR_.'/localization/'.$data['shop_country'].'.xml')) + $localization_file = _PS_ROOT_DIR_.'/localization/'.$data['shop_country'].'.xml'; + + $localization_file_content = file_get_contents($localization_file); + } $locale = new LocalizationPackCore(); - $locale->loadLocalisationPack(file_get_contents($localization_file), '', true); + $locale->loadLocalisationPack($localization_file_content, '', true); // Create default employee if (isset($data['admin_firstname']) && isset($data['admin_lastname']) && isset($data['admin_password']) && isset($data['admin_email']))