From 658a9af766307557564ed41abc5c17068531dcfa Mon Sep 17 00:00:00 2001 From: rMalie Date: Mon, 23 Jan 2012 16:46:57 +0000 Subject: [PATCH] // Restore localization in installer git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12619 b9a71923-0436-4b27-9f14-aed3839534dd --- install-new/models/install.php | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/install-new/models/install.php b/install-new/models/install.php index 40e6e91f0..354166f29 100644 --- a/install-new/models/install.php +++ b/install-new/models/install.php @@ -378,12 +378,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']))