Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development

classes/CartRule.php

@@ -119,15 +119,21 @@ class CartRuleCore extends ObjectModel
 	/**
 	 * @see ObjectModel::add()
 	 */
-	public function add($autodate = true, $nullValues = false)
+	public function add($autodate = true, $null_values = false)
 	{
-		if (!parent::add($autodate, $nullValues))
+		if (!parent::add($autodate, $null_values))
 			return false;
 
 		Configuration::updateGlobalValue('PS_CART_RULE_FEATURE_ACTIVE', '1');
 		return true;
 	}
 	
+	public function update($null_values = false)
+	{
+		Cache::clean('getContextualValue_'.$this->id.'_*');
+		return parent::update($null_values);	
+	}
+
 	/**
 	 * @see ObjectModel::delete()
 	 */

controllers/admin/AdminImportController.php

@@ -1472,9 +1472,6 @@ class AdminImportControllerCore extends AdminController
 
 		}
 
-		if (Configuration::get('PS_SEARCH_INDEXATION'))
-			Search::indexation(true);
-
 		$this->closeCsvFile($handle);
 	}
 

controllers/admin/AdminModulesController.php

@@ -208,6 +208,7 @@ class AdminModulesControllerCore extends AdminController
 			die ('KO');
 		if ($result == 'OK')
 		{
+			Configuration::updateValue('PS_LOGGED_ON_ADDONS', 1);
 			$this->context->cookie->username_addons = pSQL(trim(Tools::getValue('username_addons')));
 			$this->context->cookie->password_addons = pSQL(trim(Tools::getValue('password_addons')));
 		}

controllers/admin/AdminSearchConfController.php

@@ -113,7 +113,7 @@ class AdminSearchConfControllerCore extends AdminController
 						'title' => $this->l('Blacklisted words'),
 						'size' => 35,
 						'validation' => 'isGenericName',
-						'desc' => $this->l('Please enter the index words separated by a "|".'|".'),
+						'desc' => $this->l('Please enter the index words separated by a "|".'),
 						'type' => 'textLang'
 					)
 				),

install-dev/classes/controllerHttp.php

@@ -274,7 +274,10 @@ abstract class InstallControllerHttp
 	 */
 	public function findNextStep()
 	{
-		return (isset(self::$steps[$this->getStepOffset($this->step) + 1])) ? self::$steps[$this->getStepOffset($this->step) + 1] : false;
+		$nextStep = (isset(self::$steps[$this->getStepOffset($this->step) + 1])) ? self::$steps[$this->getStepOffset($this->step) + 1] : false;
+		if ($nextStep == 'system' && self::$instances[$nextStep]->validate())
+			$nextStep = self::$instances[$nextStep]->findNextStep();
+		return $nextStep;
 	}
 
 	/**

install-dev/langs/br/install.php

@@ -127,7 +127,7 @@ return array(
 		'Official forum' => 'Fórum oficial',
 		'Support' => 'Suporte',
 		'Documentation' => 'Documentação',
-		'Contact us!' => 'Entre em Contato !',
+		'Contact us' => 'Entre em Contato',
 		'Forum' => 'Fórum',
 		'Blog' => 'Blog',
 		'Done!' => 'Feito !',
@@ -153,8 +153,8 @@ return array(
 		'If you need help, do not hesitate to check <a href="%1$s" target="_blank">our documentation</a> or to contact our support team: %2$s' => 'Se você precisar de ajuda, não deixe de visitar <a href="%1$s" target="_blank">nossa documentação</a> ou contatar nossa equipe de suporte : %2$s',
 		'Choose the installer language:' => 'Escolha a língua para instalação :',
 		'Did you know?' => 'Você sabia ?',
-		'PrestaShop and its community offers over 40 different languages for free, directly accessible from your Back Office on the Localization tab.' => 'PrestaShop e sua comunidade oferece mais de 40 diferentes idiomas de graça, acessível diretamente a partir da sua Área Administrativa na aba localização.',
+		'PrestaShop and its community offers over %d different languages for free, directly accessible from your Back Office on the Localization tab.' => 'PrestaShop e sua comunidade oferece mais de %d diferentes idiomas de graça, acessível diretamente a partir da sua Área Administrativa na aba localização.',
-		'Licenses Agreement' => 'Acordo de licenças',
+		'License Agreements' => 'Acordo de licença',
 		'PrestaShop core is released under the OSL 3.0 while PrestaShop modules and themes are released under the AFL 3.0.' => 'O núcleo PrestaShop é publicado sob a OSL 3.0 enquanto os módulos e temas são publicados sob a AFL 3.0.',
 		'I agree to the above terms and conditions.' => 'Eu concordo com os termos e condições acima.',
 		'I agree to participate in improving the solution by sending anonymous information about my configuration.' => 'Eu concordo em participar na melhoria da solução enviando informações anônimas sobre a minha configuração.',

install-dev/langs/de/install.php

@@ -121,7 +121,7 @@
     'Official forum' => 'Offizielles Forum',
     'Support' => 'Support',
     'Documentation' => 'Tutotrials',
-    'Contact us!' => 'Kontaktieren Sie uns! Persönlicher Support',
+    'Contact us' => 'Kontaktieren Sie uns',
     'Forum' => 'Forum',
     'Blog' => 'Blog',
     'Done!' => 'Erfolgreich abgeschlossen',
@@ -146,8 +146,8 @@
     'The installation process should take only few minutes!' => 'Der Installationsprozess dauert nur ein paar Minuten!',
     'If you need help, do not hesitate to check <a href="%1$s" target="_blank">our documentation</a> or to contact our support team: %2$s' => 'Falls Sie Hilfe benötigen, haben Sie folgende Möglichkeiten: <a href="%1$s" target="_blank">unsere Dokumentation einsehen</a>oder unser Support-Team zu kontaktieren: %2$s',
     'Did you know?' => 'Wussten Sie schon?',
-    'PrestaShop and its community offers over 40 different languages for free, directly accessible from your Back Office on the Localization tab.' => 'PrestaShop und Community bietet Ihnen den kostenlosen Zugang zu über 40 verschiedenen Sprachen direkt aus Ihrem Back-office im Tabreiter "Tools"',
+    'PrestaShop and its community offers over %d different languages for free, directly accessible from your Back Office on the Localization tab.' => 'PrestaShop und Community bietet Ihnen den kostenlosen Zugang zu über %d verschiedenen Sprachen direkt aus Ihrem Back-office im Tabreiter "Tools"',
-    'Licenses Agreement' => 'Lizenzvertrag',
+    'License Agreements' => 'Lizenzvertrag',
     'PrestaShop core is released under the OSL 3.0 while PrestaShop modules and themes are released under the AFL 3.0.' => 'PrestaShop core is unter der Lizenz OSL 3.0 herausgegeben. PrestaShop modules und Themes werden unter der Lizenz AFL 3.0. herausgegeben',
     'I agree to the above terms and conditions.' => 'Ich stimme den oben genannten Vertragsbedingungen zu.',
     'I agree to participate in improving the solution by sending anonymous information about my configuration.' => 'Ich möchte Prestashop in der verbesserung von Fehlern helfen, und stimme zu, dass bei groben Fehlern meine Konfigurationsdaten an Prestashop gesandt werden',

install-dev/langs/es/install.php

@@ -121,7 +121,7 @@
     'Official forum' => NULL,
     'Support' => NULL,
     'Documentation' => NULL,
-    'Contact us!' => '¡Contacte con nosotros!',
+    'Contact us' => 'Contacte con nosotros',
     'Forum' => NULL,
     'Blog' => 'El blog',
     'Done!' => NULL,
@@ -146,8 +146,8 @@
     'The installation process should take only few minutes!' => 'El proceso de instalación tardará solo unos minutos.',
     'If you need help, do not hesitate to check <a href="%1$s" target="_blank">our documentation</a> or to contact our support team: %2$s' => NULL,
     'Did you know?' => '¿Sabía que?',
-    'PrestaShop and its community offers over 40 different languages for free, directly accessible from your Back Office on the Localization tab.' => NULL,
+    'PrestaShop and its community offers over %d different languages for free, directly accessible from your Back Office on the Localization tab.' => NULL,
-    'Licenses Agreement' => 'Contrato de Licencia',
+    'License Agreements' => 'Contrato de Licencia',
     'PrestaShop core is released under the OSL 3.0 while PrestaShop modules and themes are released under the AFL 3.0.' => NULL,
     'I agree to the above terms and conditions.' => 'Estoy de acuerdo con los términos y condiciones.',
     'I agree to participate in improving the solution by sending anonymous information about my configuration.' => NULL,

install-dev/langs/fr/install.php

@@ -127,7 +127,7 @@ return array(
 		'Official forum' => 'Forum officiel',
 		'Support' => 'Support',
 		'Documentation' => 'Documentation',
-		'Contact us!' => 'Nous contacter !',
+		'Contact us' => 'Nous contacter',
 		'Forum' => 'Forum',
 		'Blog' => 'Blog',
 		'Done!' => 'Fin !',
@@ -153,8 +153,8 @@ return array(
 		'If you need help, do not hesitate to check <a href="%1$s" target="_blank">our documentation</a> or to contact our support team: %2$s' => 'Si vous avez besoin d\'aide, n\'hésitez pas à visiter <a href="%1$s" target="_blank">notre documentation</a> ou à contacter notre équipe de support : %2$s',
 		'Choose the installer language:' => 'Choisissez la langue pour l\'installation :',
 		'Did you know?' => 'Le saviez vous ?',
-		'PrestaShop and its community offers over 40 different languages for free, directly accessible from your Back Office on the Localization tab.' => 'PrestaShop et sa communauté vous proposent plus de 40 langues gratuites directement accessibles depuis votre administration',
+		'PrestaShop and its community offers over %d different languages for free, directly accessible from your Back Office on the Localization tab.' => 'PrestaShop et sa communauté vous proposent gratuitement des traductions dans %d langues directement accessibles depuis votre administration.',
-		'Licenses Agreement' => 'Contrat de licences',
+		'License Agreements' => 'Contrats de licence',
 		'PrestaShop core is released under the OSL 3.0 while PrestaShop modules and themes are released under the AFL 3.0.' => 'Le cœur de PrestaShop est publié sous licence OSL 3.0 tandis que les modules et thèmes sont publiés sous licence AFL 3.0.',
 		'I agree to the above terms and conditions.' => 'J\'approuve les termes et conditions du contrat ci-dessus.',
 		'I agree to participate in improving the solution by sending anonymous information about my configuration.' => 'J\'accepte de participer à l\'amélioration de la solution en envoyant des informations anonymes sur ma configuration',

install-dev/langs/it/install.php

@@ -121,7 +121,7 @@
     'Official forum' => 'Forum ufficiale',
     'Support' => 'Supporto',
     'Documentation' => 'Documentazione',
-    'Contact us!' => 'Contattaci!',
+    'Contact us' => 'Contattaci',
     'Forum' => 'Forum',
     'Blog' => 'Il blog',
     'Done!' => 'Fatto!',
@@ -146,8 +146,8 @@
     'The installation process should take only few minutes!' => 'Il processo di installazione dovrebbe durare solo pochi minuti!',
     'If you need help, do not hesitate to check <a href="%1$s" target="_blank">our documentation</a> or to contact our support team: %2$s' => 'Se hai bisogno di aiuto non asitare a guardare <a href="%1$s" target="_blank">our documentation</a> o contattare il nostro supporto: %2$s',
     'Did you know?' => 'Lo sapevi?',
-    'PrestaShop and its community offers over 40 different languages for free, directly accessible from your Back Office on the Localization tab.' => 'PrestaShop e la sua comunità offre 40 diverse lingue gratuite, direttamente accessibile nel tuo back office nel tab Traduzioni',
+    'PrestaShop and its community offers over %d different languages for free, directly accessible from your Back Office on the Localization tab.' => 'PrestaShop e la sua comunità offre %d diverse lingue gratuite, direttamente accessibile nel tuo back office nel tab Traduzioni',
-    'Licenses Agreement' => 'Contratto di Licenza',
+    'License Agreements' => 'Contratto di Licenza',
     'PrestaShop core is released under the OSL 3.0 while PrestaShop modules and themes are released under the AFL 3.0.' => 'Il core di PrestaShop è rilasicata sollo licenza OSL 3.0 mentre i moduli e i temi prestashop sono rilasciati sotto licenza AFL 3.0',
     'I agree to the above terms and conditions.' => 'Accetto i termini e le condizioni del contratto seguente.',
     'I agree to participate in improving the solution by sending anonymous information about my configuration.' => 'Accetto di partecipare nell\'implementare la soluzione inviando informazioni anonime sulla mia configurazione',

install-dev/theme/js/welcome.js

@@ -22,4 +22,9 @@ $(document).ready(function()
 		else
 			$('#btNext').addClass('disabled').attr('disabled', true);
 	});
+	
+	if ($('#set_license').prop('checked'))
+		$('#btNext').removeClass('disabled').attr('disabled', false);
+	else
+		$('#btNext').addClass('disabled').attr('disabled', true);
 });

install-dev/theme/views/footer.phtml

@@ -25,7 +25,7 @@
 	<li><a href="http://www.prestashop.com" title="PrestaShop.com" target="_blank">PrestaShop.com</a> | </li>
 	<li><a href="<?php echo $this->getSupportLink() ?>" title="<?php echo $this->l('Support'); ?>" target="_blank"><?php echo $this->l('Support'); ?></a> | </li>
 	<li><a href="<?php echo $this->getDocumentationLink() ?>" title="<?php echo $this->l('Documentation'); ?>" target="_blank"><?php echo $this->l('Documentation'); ?></a> | </li>
-	<li><a href="http://www.prestashop.com/contact.php" title="<?php echo $this->l('Contact us!'); ?>" target="_blank"><?php echo $this->l('Contact us!'); ?></a> | </li>
+	<li><a href="http://www.prestashop.com/contact.php" title="<?php echo $this->l('Contact us'); ?>" target="_blank"><?php echo $this->l('Contact us'); ?></a> | </li>
 	<li>&copy; 2005-<?php echo date('Y'); ?></li>
 </ul>
 <script type="text/javascript">

install-dev/theme/views/header.phtml

@@ -76,7 +76,7 @@
 <div id="sheets" class="sheet shown">
 	<div id="sheet_<?php echo $this->step ?>" class="sheet shown clearfix">
 	<div class="contentTitle">
-		<h1><?php echo $this->l('menu_'.$this->step) ?></h1>
+		<h1><?php echo $this->l('Installation wizard') ?></h1>
 
 		<ul id="stepList_1" class="stepList clearfix">
 			<?php foreach ($this->getSteps() as $step): ?>

install-dev/theme/views/welcome.phtml

@@ -39,12 +39,12 @@
 
 <!-- Did you know -->
 <h3 class="no-margin"><?php echo $this->l('Did you know?'); ?></h3>
-<p><?php echo $this->l('PrestaShop and its community offers over 40 different languages for free, directly accessible from your Back Office on the Localization tab.'); ?> </p>
+<p><?php echo $this->l('PrestaShop and its community offers over %d different languages for free, directly accessible from your Back Office on the Localization tab.', 56); ?> </p>
 
 <!-- License agreement -->
-<h2 id="licenses-agreement"><?php echo $this->l('Licenses Agreement') ?></h2>
+<h2 id="licenses-agreement"><?php echo $this->l('License Agreements') ?></h2>
+<p><strong><?php echo $this->l('PrestaShop core is released under the OSL 3.0 while PrestaShop modules and themes are released under the AFL 3.0.') ?></strong></p>
 <div style="height:200px; border:1px solid #ccc; margin-bottom:8px; padding:5px; background:#fff; overflow: auto; overflow-x:hidden; overflow-y:scroll;">
-	<p><strong><?php echo $this->l('PrestaShop core is released under the OSL 3.0 while PrestaShop modules and themes are released under the AFL 3.0.') ?></strong></p>
 	<h3>Core: Open Software License ("OSL") v. 3.0</h3>
 	<p>This Open Software License (the "License") applies to any original work of authorship (the "Original Work") whose owner (the "Licensor") has placed the following licensing notice adjacent to the copyright notice for the Original Work:</p>
 	<h4>Licensed under the Open Software License version 3.0</h4>
@@ -100,16 +100,12 @@
 	<p><strong>16. Modification of This License.</strong> This License is Copyright © 2005 Lawrence Rosen. Permission is granted to copy, distribute, or communicate this License without modification. Nothing in this License permits You to modify this License as applied to the Original Work or to Derivative Works. However, You may modify the text of this License and copy, distribute or communicate your modified version (the "Modified License") and apply it to other original works of authorship subject to the following conditions: (i) You may not indicate in any way that your Modified License is the "Academic Free License" or "AFL" and you may not use those names in the name of your Modified License; (ii) You must replace the notice specified in the first paragraph above with the notice "Licensed under &lt;insert your license name here&gt;" or with a notice of your own that is not confusingly similar to the notice in this License; and (iii) You may not claim that your original works are open source software unless your Modified License has been approved by Open Source Initiative (OSI) and You comply with its license review and certification process.</p>
 </div>
 
-<p>
+<div>
-	<label>
+	<input type="checkbox" id="set_license" class="required" name="licence_agrement" value="1" style="vertical-align: middle;float:left" <?php if ($this->session->licence_agrement): ?>checked="checked"<?php endif; ?> />
-		<input type="checkbox" id="set_license" class="required" name="licence_agrement" value="1" style="vertical-align: middle;" <?php if ($this->session->licence_agrement): ?>checked="checked"<?php endif; ?> />
+	<div style="float:left;width:600px;margin-left:8px"><strong><?php echo $this->l('I agree to the above terms and conditions.') ?></strong></div>
-		<strong><?php echo $this->l('I agree to the above terms and conditions.') ?></strong>
-	</label>
 	<br />
-	<label>
+	<input type="checkbox" name="configuration_agrement" value="1" style="vertical-align: middle;float:left" <?php if ($this->session->configuration_agrement): ?>checked="checked"<?php endif; ?> />
-		<input type="checkbox" name="configuration_agrement" value="1" style="vertical-align: middle;" <?php if ($this->session->configuration_agrement): ?>checked="checked"<?php endif; ?> />
+	<div style="float:left;width:600px;margin-left:8px"><strong><?php echo $this->l('I agree to participate in improving the solution by sending anonymous information about my configuration.') ?></strong></div>
-		<strong><?php echo $this->l('I agree to participate in improving the solution by sending anonymous information about my configuration.') ?></strong>
+</div>
-	</label>
-</p>
 
 <?php $this->displayTemplate('footer') ?>