// Move log classes and add logger in new installer

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12205 b9a71923-0436-4b27-9f14-aed3839534dd

install-new/classes/model.php

@@ -32,6 +32,11 @@ abstract class InstallAbstractModel
 	 */
 	public $language;
 
+	/**
+	 * @var FileLogger
+	 */
+	public $logger;
+
 	/**
 	 * @var array List of errors
 	 */
@@ -40,6 +45,9 @@ abstract class InstallAbstractModel
 	public function __construct()
 	{
 		$this->language = InstallLanguages::getInstance();
+
+		$this->logger = new FileLogger();
+		$this->logger->setFilename(_PS_ROOT_DIR_.'/log/'.@date('Ymd').'_installation.log');
 	}
 
 	public function setError($errors)
@@ -48,7 +56,10 @@ abstract class InstallAbstractModel
 			$errors = array($errors);
 
 		foreach ($errors as $error)
+		{
 			$this->errors[] = $error;
+			$this->logger->logError($error);
+		}
 	}
 
 	public function getErrors()

install-new/models/install.php

@@ -377,21 +377,12 @@ class InstallModelInstall extends InstallAbstractModel
 		}
 
 		// Set localization configuration
-        $version = str_replace('.', '', _PS_VERSION_);
+		$localization_file = _PS_ROOT_DIR_.'/localization/default.xml';
-        $version = substr($version, 0, 2);
+		if (file_exists(_PS_ROOT_DIR_.'/localization/'.$data['shop_country'].'.xml'))
-
+			$localization_file = _PS_ROOT_DIR_.'/localization/'.$data['shop_country'].'.xml';
-        $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($localization_file_content, '', true);
+		$locale->loadLocalisationPack(file_get_contents($localization_file), '', true);
 
 		// Create default employee
 		if (isset($data['admin_firstname']) && isset($data['admin_lastname']) && isset($data['admin_password']) && isset($data['admin_email']))