diff --git a/install-dev/controllers/http/configure.php b/install-dev/controllers/http/configure.php index 8feabe68b..f66b4cc11 100644 --- a/install-dev/controllers/http/configure.php +++ b/install-dev/controllers/http/configure.php @@ -72,14 +72,20 @@ class InstallControllerHttpConfigure extends InstallControllerHttp // Check shop name if ($this->session->shop_name && !Validate::isGenericName($this->session->shop_name)) $this->errors['shop_name'] = $this->l('Invalid shop name'); - + else if (strlen($this->session->shop_name) > 64) + $this->errors['shop_name'] = $this->l('The field %s is limited to %d characters', $this->l('shop name'), 64); + // Check admin name if ($this->session->admin_firstname && !Validate::isName($this->session->admin_firstname)) $this->errors['admin_firstname'] = $this->l('Your firstname contains some invalid characters'); - + else if (strlen($this->session->admin_firstname) > 32) + $this->errors['admin_firstname'] = $this->l('The field %s is limited to %d characters', $this->l('firstname'), 32); + if ($this->session->admin_lastname && !Validate::isName($this->session->admin_lastname)) $this->errors['admin_lastname'] = $this->l('Your lastname contains some invalid characters'); - + else if (strlen($this->session->admin_lastname) > 32) + $this->errors['admin_lastname'] = $this->l('The field %s is limited to %d characters', $this->l('lastname'), 32); + // Check passwords if ($this->session->admin_password) { diff --git a/install-dev/langs/fr/install.php b/install-dev/langs/fr/install.php index 35d13d91b..28b0d1f40 100644 --- a/install-dev/langs/fr/install.php +++ b/install-dev/langs/fr/install.php @@ -195,5 +195,9 @@ return array( 'Warning: You cannot use anymore this tool to upgrade your store.

You already have PrestaShop version %1$s installed.

If you want to upgrade to the latest version please read our documentation: %2$s' => 'Attention: Vous ne pouvez plus utiliser cet outil pour mettre à jour votre boutique.

Vous avez déjà PrestaShop version %1$s d\'installé.

Si vous souhaitez utiliser la dernière version, merci de vous référer à notre documentation pour la mise à jour : %2$s', 'PrestaShop Wizard Installer' => 'Installation de PrestaShop', 'If you are experiencing problems during the installation process, please call our team at %s and one of our experts will be happy to help.' => 'PrestaShop peut vous assister si vous rencontrez un obstacle lors de l\'installation de votre boutique. Contactez notre équipe au %s et indiquez-nous l\'URL de votre boutique. Nous serons heureux de vous aider dans les dernières étapes de l\'installation !', + 'The field %s is limited to %d characters' => 'Le champs %s est limité à %d caractères', + 'shop name' => 'nom de la boutique', + 'firstname' => 'prénom', + 'lastname' => 'nom de famille', ), ); \ No newline at end of file diff --git a/install-dev/upgrade/sql/1.5.3.0.sql b/install-dev/upgrade/sql/1.5.3.0.sql index 7633f3711..53cc5c870 100644 --- a/install-dev/upgrade/sql/1.5.3.0.sql +++ b/install-dev/upgrade/sql/1.5.3.0.sql @@ -8,9 +8,9 @@ ALTER TABLE `PREFIX_address` CHANGE `outstanding_allow_amount` `outstanding_all UPDATE `PREFIX_order_state` SET `delivery` = 0 WHERE `id_order_state` = 3; -ALTER TABLE `PREFIX_product_shop` ADD `id_product_redirected` int(10) unsigned NOT NULL default '0' AFTER `active` , ADD `available_for_order` tinyint(1) NOT NULL default '1' AFTER `id_product_redirected`; +ALTER TABLE `PREFIX_product_shop` ADD `id_product_redirected` int(10) unsigned NOT NULL default '0' AFTER `active` ; -ALTER TABLE `PREFIX_product` ADD `id_product_redirected` int(10) unsigned NOT NULL default '0' AFTER `active` , ADD `available_for_order` tinyint(1) NOT NULL default '1' AFTER `id_product_redirected`; +ALTER TABLE `PREFIX_product` ADD `id_product_redirected` int(10) unsigned NOT NULL default '0' AFTER `active` ; UPDATE `PREFIX_order_state` SET `send_email` = 1 WHERE `id_order_state` = (SELECT `value` FROM `PREFIX_configuration` WHERE `name` = 'PS_OS_WS_PAYMENT' LIMIT 1);