From db3be40c060c84c85ce3a34b4ff97b2a4109bc11 Mon Sep 17 00:00:00 2001 From: Samy Rabih Date: Tue, 22 Jan 2013 14:34:17 +0100 Subject: [PATCH 1/8] Disable search indexation Search indexation is very CPU-intensive, it should not be used here --- controllers/admin/AdminImportController.php | 3 --- 1 file changed, 3 deletions(-) diff --git a/controllers/admin/AdminImportController.php b/controllers/admin/AdminImportController.php index 20e62134b..238eb6d12 100644 --- a/controllers/admin/AdminImportController.php +++ b/controllers/admin/AdminImportController.php @@ -1464,9 +1464,6 @@ class AdminImportControllerCore extends AdminController } - if (Configuration::get('PS_SEARCH_INDEXATION')) - Search::indexation(true); - $this->closeCsvFile($handle); } From 0dc94f163b7cc653b566c4b85c650f04a6340bd0 Mon Sep 17 00:00:00 2001 From: Pierre Date: Tue, 29 Jan 2013 13:43:12 +0100 Subject: [PATCH 2/8] Fixes Syntax Error in Line 126 There was a Typo / Syntax Error in Line 116. --- controllers/admin/AdminSearchConfController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/controllers/admin/AdminSearchConfController.php b/controllers/admin/AdminSearchConfController.php index 34b294c5b..274543f5f 100644 --- a/controllers/admin/AdminSearchConfController.php +++ b/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' ) ), From 3b2be13f2e3ac7610873eb3cb1117739917aba4b Mon Sep 17 00:00:00 2001 From: Damien Metzger Date: Fri, 1 Feb 2013 10:30:59 +0100 Subject: [PATCH 3/8] // Added a configuration variable when logged on addons from the back end --- controllers/admin/AdminModulesController.php | 1 + 1 file changed, 1 insertion(+) diff --git a/controllers/admin/AdminModulesController.php b/controllers/admin/AdminModulesController.php index d1c3dfeb8..c6dc37a88 100644 --- a/controllers/admin/AdminModulesController.php +++ b/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'))); } From 7b6b9ceaf6eb2a348460d1ea9cb468316c32619f Mon Sep 17 00:00:00 2001 From: Damien Metzger Date: Fri, 1 Feb 2013 17:20:40 +0100 Subject: [PATCH 4/8] [*] Installer : Automatically drop the system compatibility check when everything's alright // Fixed 'next' button when the page is refreshed --- install-dev/classes/controllerHttp.php | 5 ++++- install-dev/theme/js/welcome.js | 5 +++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/install-dev/classes/controllerHttp.php b/install-dev/classes/controllerHttp.php index 2375356a4..fea1b6d12 100644 --- a/install-dev/classes/controllerHttp.php +++ b/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; } /** diff --git a/install-dev/theme/js/welcome.js b/install-dev/theme/js/welcome.js index fa2a9c467..69b8fd351 100644 --- a/install-dev/theme/js/welcome.js +++ b/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); }); \ No newline at end of file From 1b815134a156e0bb6001ce7783fcb26466b76c54 Mon Sep 17 00:00:00 2001 From: Damien Metzger Date: Fri, 1 Feb 2013 17:29:02 +0100 Subject: [PATCH 5/8] // A few changes in the installation wizard --- install-dev/langs/br/install.php | 4 ++-- install-dev/langs/de/install.php | 4 ++-- install-dev/langs/es/install.php | 4 ++-- install-dev/langs/fr/install.php | 4 ++-- install-dev/langs/it/install.php | 4 ++-- install-dev/theme/views/footer.phtml | 2 +- install-dev/theme/views/header.phtml | 2 +- install-dev/theme/views/welcome.phtml | 4 ++-- 8 files changed, 14 insertions(+), 14 deletions(-) diff --git a/install-dev/langs/br/install.php b/install-dev/langs/br/install.php index e6724e2f2..67e4d743d 100644 --- a/install-dev/langs/br/install.php +++ b/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 !', @@ -154,7 +154,7 @@ return array( '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.', - '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.', diff --git a/install-dev/langs/de/install.php b/install-dev/langs/de/install.php index 0b1e1fbac..2c327930b 100644 --- a/install-dev/langs/de/install.php +++ b/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', @@ -147,7 +147,7 @@ 'If you need help, do not hesitate to check our documentation or to contact our support team: %2$s' => 'Falls Sie Hilfe benötigen, haben Sie folgende Möglichkeiten: unsere Dokumentation einsehenoder 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"', - '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', diff --git a/install-dev/langs/es/install.php b/install-dev/langs/es/install.php index 719039b28..380adf4b2 100644 --- a/install-dev/langs/es/install.php +++ b/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, @@ -147,7 +147,7 @@ 'If you need help, do not hesitate to check our documentation 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, - '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, diff --git a/install-dev/langs/fr/install.php b/install-dev/langs/fr/install.php index 28b0d1f40..ed884acf1 100644 --- a/install-dev/langs/fr/install.php +++ b/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 !', @@ -154,7 +154,7 @@ return array( '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', - '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', diff --git a/install-dev/langs/it/install.php b/install-dev/langs/it/install.php index 994f45997..ffbe19ea9 100644 --- a/install-dev/langs/it/install.php +++ b/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!', @@ -147,7 +147,7 @@ 'If you need help, do not hesitate to check our documentation or to contact our support team: %2$s' => 'Se hai bisogno di aiuto non asitare a guardare our documentation 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', - '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', diff --git a/install-dev/theme/views/footer.phtml b/install-dev/theme/views/footer.phtml index 4107ab37a..f07434609 100644 --- a/install-dev/theme/views/footer.phtml +++ b/install-dev/theme/views/footer.phtml @@ -25,7 +25,7 @@
  • PrestaShop.com |
  • l('Support'); ?> |
  • l('Documentation'); ?> |
    • -
  • l('Contact us!'); ?> |
    • +
  • l('Contact us'); ?> |
  • © 2005-