From 6e7145d022c2315f495f20422bf229b207ccafed Mon Sep 17 00:00:00 2001 From: Thomas Nabord Date: Mon, 24 Sep 2018 14:17:28 +0100 Subject: [PATCH 1/6] Update readme for php requirements --- Readme.md | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/Readme.md b/Readme.md index c3ae80766..0c8ade197 100644 --- a/Readme.md +++ b/Readme.md @@ -8,15 +8,15 @@ This module is compatible with all PrestaShop 1.6 & 1.7. # Prerequisites * PrestaShop 1.6 or 1.7 -* PHP 5.6+ +* PHP 5.6+ -# Installation +For older PHP versions, see previous releases of the module [(ex. v1.6.8)](https://github.com/PrestaShop/autoupgrade/releases/tag/v1.6.8). +Note they are unsupported and we strongly recommend you to upgrade your PHP version. -You must have [composer][4] installed on your computer. Then, execute: +# Installation -``` -$ composer install -``` +All versions can be found in the [releases list](https://github.com/PrestaShop/autoupgrade/releases). +Zip archives can be directly uploaded on your module page. # Running an upgrade on PrestaShop @@ -42,7 +42,16 @@ $ php cli-upgrade.php --dir=admin-dev --channel=major PrestaShop modules are open-source extensions to the PrestaShop e-commerce solution. Everyone is welcome and even encouraged to contribute with their own improvements. -### Requirements +To contribute on this project, start by cloning the repository. +You must have [composer][4] installed on your computer. Run the following command: + +``` +$ composer install +``` + +Your module will be available with development libraries. + +### GitHub Requirements Contributors **must** follow the following rules: From 892452f421c14b3c78ef3721df88ce0093d7f299 Mon Sep 17 00:00:00 2001 From: Pablo Borowicz Date: Tue, 9 Oct 2018 14:11:13 +0200 Subject: [PATCH 2/6] Fix wordings without domain --- classes/UpgradeTools/CoreUpgrader/CoreUpgrader16.php | 2 +- classes/UpgradeTools/SettingsFileWriter.php | 4 ++-- views/templates/block/activityLog.twig | 1 + views/templates/block/channelInfo.twig | 2 +- views/templates/block/checklist.twig | 1 + views/templates/block/rollbackForm.twig | 1 + views/templates/block/upgradeButtonBlock.twig | 2 +- views/templates/block/versionComparison.twig | 1 + views/templates/main.twig | 1 + 9 files changed, 10 insertions(+), 5 deletions(-) diff --git a/classes/UpgradeTools/CoreUpgrader/CoreUpgrader16.php b/classes/UpgradeTools/CoreUpgrader/CoreUpgrader16.php index eb7eb60e7..b410228f4 100644 --- a/classes/UpgradeTools/CoreUpgrader/CoreUpgrader16.php +++ b/classes/UpgradeTools/CoreUpgrader/CoreUpgrader16.php @@ -73,7 +73,7 @@ public function writeNewSettings() $writer = new SettingsFileWriter($this->container->getTranslator()); $writer->writeSettingsFile(SETTINGS_FILE, $datas); - $this->logger->debug($this->container->getTranslator()->trans('Settings file updated')); + $this->logger->debug($this->container->getTranslator()->trans('Settings file updated', array(), 'Modules.Autoupgrade.Admin')); } protected function initConstants() diff --git a/classes/UpgradeTools/SettingsFileWriter.php b/classes/UpgradeTools/SettingsFileWriter.php index a72ea7530..4e5e7c7ef 100644 --- a/classes/UpgradeTools/SettingsFileWriter.php +++ b/classes/UpgradeTools/SettingsFileWriter.php @@ -57,7 +57,7 @@ public function migrateSettingsFile(LoggerInterface $logger) public function writeSettingsFile($filePath, $data) { if (!is_writable($filePath)) { - throw new UpgradeException($this->translator->trans('Error when opening settings.inc.php file in write mode')); + throw new UpgradeException($this->translator->trans('Error when opening settings.inc.php file in write mode', array(), 'Modules.Autoupgrade.Admin')); } // Create backup file @@ -68,7 +68,7 @@ public function writeSettingsFile($filePath, $data) fwrite($fd, ' $value) { if (false === fwrite($fd, "define('$name', '{$this->checkString($value)}');" . PHP_EOL)) { - throw new UpgradeException($this->translator->trans('Error when generating new settings.inc.php file.')); + throw new UpgradeException($this->translator->trans('Error when generating new settings.inc.php file.', array(), 'Modules.Autoupgrade.Admin')); } } fclose($fd); diff --git a/views/templates/block/activityLog.twig b/views/templates/block/activityLog.twig index c683e06f2..d9081edd1 100644 --- a/views/templates/block/activityLog.twig +++ b/views/templates/block/activityLog.twig @@ -1,3 +1,4 @@ +{% trans_default_domain 'Modules.Autoupgrade.Admin' %}