From a14118863ebf6bdd4eb2df4a3bf4343ea872e667 Mon Sep 17 00:00:00 2001 From: Damien Metzger Date: Tue, 8 Oct 2013 14:27:44 +0200 Subject: [PATCH] // Code cleaning --- .../controllers/products/helpers/form/form.tpl | 2 +- controllers/admin/AdminProductsController.php | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/admin-dev/themes/default/template/controllers/products/helpers/form/form.tpl b/admin-dev/themes/default/template/controllers/products/helpers/form/form.tpl index 3fd65e7e7..07ba4b9d5 100644 --- a/admin-dev/themes/default/template/controllers/products/helpers/form/form.tpl +++ b/admin-dev/themes/default/template/controllers/products/helpers/form/form.tpl @@ -242,7 +242,7 @@

{l s='Your product will be saved as a draft.'} - {l s='Save and preview.'} + {l s='Save and preview'}

diff --git a/controllers/admin/AdminProductsController.php b/controllers/admin/AdminProductsController.php index 4e248c459..bc5fc585b 100644 --- a/controllers/admin/AdminProductsController.php +++ b/controllers/admin/AdminProductsController.php @@ -2423,7 +2423,7 @@ class AdminProductsControllerCore extends AdminController '.$this->l('Your product will be saved as a draft.').' - '.$this->l('Save and preview.').' + '.$this->l('Save and preview').'

@@ -2506,7 +2506,7 @@ class AdminProductsControllerCore extends AdminController $this->toolbar_btn['delete'] = array( 'short' => 'Delete', 'href' => $this->context->link->getAdminLink('AdminProducts').'&id_product='.(int)$product->id.'&deleteproduct', - 'desc' => $this->l('Delete this product.'), + 'desc' => $this->l('Delete this product'), 'confirm' => 1, 'js' => 'if (confirm(\''.$this->l('Delete product?').'\')){return true;}else{event.preventDefault();}' ); @@ -2614,7 +2614,7 @@ class AdminProductsControllerCore extends AdminController { $this->product_exists_in_shop = false; if ($this->tab_display == 'Informations') - $this->displayWarning($this->l('Warning: The product does not exist in this shop.')); + $this->displayWarning($this->l('Warning: The product does not exist in this shop')); $default_product = new Product(); $definition = ObjectModel::getDefinition($product); @@ -2771,7 +2771,7 @@ class AdminProductsControllerCore extends AdminController ); if ($id_currency <= 0 || ( !($result = Currency::getCurrency($id_currency)) || empty($result) )) - $this->errors[] = Tools::displayError($this->l('The selected currency is not valid.')); + $this->errors[] = Tools::displayError('The selected currency is not valid'); // Save product-supplier data $product_supplier_id = (int)ProductSupplier::getIdByProductAndSupplier($product->id, $attribute['id_product_attribute'], $supplier->id_supplier); @@ -3177,7 +3177,7 @@ class AdminProductsControllerCore extends AdminController if (!file_exists($exists_file) && !empty($product->productDownload->display_filename) && empty($product->cache_default_attribute)) - $msg = sprintf(Tools::displayError('This file "%s" is missing.'), $product->productDownload->display_filename); + $msg = sprintf(Tools::displayError('This file "%s" is missing'), $product->productDownload->display_filename); else $msg = ''; @@ -4383,7 +4383,7 @@ class AdminProductsControllerCore extends AdminController '.$this->l('Your product will be saved as a draft.').' - '.$this->l('Save and preview.').' + '.$this->l('Save and preview').'

';