From d9cb7eb475cd50143726b95c270faad9140ddf2b Mon Sep 17 00:00:00 2001 From: tDidierjean Date: Fri, 18 Nov 2011 14:09:17 +0000 Subject: [PATCH] // Remove unused attributeLang git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10265 b9a71923-0436-4b27-9f14-aed3839534dd --- controllers/admin/AdminAttributesGroupsController.php | 3 --- controllers/admin/AdminCarriersController.php | 1 - controllers/admin/AdminCategoriesController.php | 6 ------ controllers/admin/AdminCountriesController.php | 1 - controllers/admin/AdminGendersController.php | 1 - controllers/admin/AdminManufacturersController.php | 6 ------ controllers/admin/AdminMetaController.php | 4 ---- controllers/admin/AdminOrderMessageController.php | 2 -- controllers/admin/AdminProfilesController.php | 1 - controllers/admin/AdminQuickAccessesController.php | 1 - controllers/admin/AdminStatusesController.php | 3 --- controllers/admin/AdminStockMvtController.php | 1 - controllers/admin/AdminSupplyOrdersController.php | 2 -- controllers/admin/AdminTabsController.php | 3 +-- 14 files changed, 1 insertion(+), 34 deletions(-) diff --git a/controllers/admin/AdminAttributesGroupsController.php b/controllers/admin/AdminAttributesGroupsController.php index 6b38808f3..ce4c3fe2f 100644 --- a/controllers/admin/AdminAttributesGroupsController.php +++ b/controllers/admin/AdminAttributesGroupsController.php @@ -182,7 +182,6 @@ class AdminAttributesGroupsControllerCore extends AdminController 'label' => $this->l('Name:'), 'name' => 'name', 'lang' => true, - 'attributeLang' => 'name¤public_name', 'size' => 33, 'required' => true, 'hint' => $this->l('Invalid characters:').' <>;=#{}' @@ -192,7 +191,6 @@ class AdminAttributesGroupsControllerCore extends AdminController 'label' => $this->l('Public name:'), 'name' => 'public_name', 'lang' => true, - 'attributeLang' => 'name¤public_name', 'size' => 33, 'required' => true, 'hint' => $this->l('Invalid characters:').' <>;=#{}', @@ -249,7 +247,6 @@ class AdminAttributesGroupsControllerCore extends AdminController 'label' => $this->l('Name:'), 'name' => 'name', 'lang' => true, - 'attributeLang' => 'name', 'size' => 33, 'required' => true, 'hint' => $this->l('Invalid characters:').' <>;=#{}' diff --git a/controllers/admin/AdminCarriersController.php b/controllers/admin/AdminCarriersController.php index bbfb7892a..6ee2c8cbb 100644 --- a/controllers/admin/AdminCarriersController.php +++ b/controllers/admin/AdminCarriersController.php @@ -208,7 +208,6 @@ class AdminCarriersControllerCore extends AdminController 'label' => $this->l('Transit time:'), 'name' => 'delay', 'lang' => true, - 'attributeLang' => 'delay', 'required' => true, 'size' => 41, 'maxlength' => 128, diff --git a/controllers/admin/AdminCategoriesController.php b/controllers/admin/AdminCategoriesController.php index 1b91b9662..4f4a1a6a9 100644 --- a/controllers/admin/AdminCategoriesController.php +++ b/controllers/admin/AdminCategoriesController.php @@ -177,7 +177,6 @@ class AdminCategoriesControllerCore extends AdminController 'label' => $this->l('Name:'), 'name' => 'name', 'lang' => true, - 'attributeLang' => 'name¤description¤meta_title¤meta_description¤meta_keywords¤link_rewrite', 'size' => 48, 'required' => true, 'hint' => $this->l('Invalid characters:').' <>;=#{}' @@ -225,7 +224,6 @@ class AdminCategoriesControllerCore extends AdminController 'label' => $this->l('Description:'), 'name' => 'description', 'lang' => true, - 'attributeLang' => 'name¤description¤meta_title¤meta_description¤meta_keywords¤link_rewrite', 'rows' => 10, 'cols' => 100, 'hint' => $this->l('Invalid characters:').' <>;=#{}' @@ -242,7 +240,6 @@ class AdminCategoriesControllerCore extends AdminController 'label' => $this->l('Meta title:'), 'name' => 'meta_title', 'lang' => true, - 'attributeLang' => 'name¤description¤meta_title¤meta_description¤meta_keywords¤link_rewrite', 'hint' => $this->l('Forbidden characters:').' <>;=#{}' ), array( @@ -250,7 +247,6 @@ class AdminCategoriesControllerCore extends AdminController 'label' => $this->l('Meta description:'), 'name' => 'meta_description', 'lang' => true, - 'attributeLang' => 'name¤description¤meta_title¤meta_description¤meta_keywords¤link_rewrite', 'hint' => $this->l('Forbidden characters:').' <>;=#{}' ), array( @@ -258,7 +254,6 @@ class AdminCategoriesControllerCore extends AdminController 'label' => $this->l('Meta keywords:'), 'name' => 'meta_keywords', 'lang' => true, - 'attributeLang' => 'name¤description¤meta_title¤meta_description¤meta_keywords¤link_rewrite', 'hint' => $this->l('Forbidden characters:').' <>;=#{}' ), array( @@ -266,7 +261,6 @@ class AdminCategoriesControllerCore extends AdminController 'label' => $this->l('Friendly URL:'), 'name' => 'link_rewrite', 'lang' => true, - 'attributeLang' => 'name¤description¤meta_title¤meta_description¤meta_keywords¤link_rewrite', 'required' => true, 'hint' => $this->l('Forbidden characters:').' <>;=#{}' ), diff --git a/controllers/admin/AdminCountriesController.php b/controllers/admin/AdminCountriesController.php index 9f8d852e1..aa9f81e46 100644 --- a/controllers/admin/AdminCountriesController.php +++ b/controllers/admin/AdminCountriesController.php @@ -154,7 +154,6 @@ class AdminCountriesControllerCore extends AdminController 'label' => $this->l('Country:'), 'name' => 'name', 'lang' => true, - 'attributeLang' => 'name', 'size' => 30, 'required' => true, 'hint' => $this->l('Invalid characters:').' <>;=#{}', diff --git a/controllers/admin/AdminGendersController.php b/controllers/admin/AdminGendersController.php index fba259a44..5bf02bcd1 100644 --- a/controllers/admin/AdminGendersController.php +++ b/controllers/admin/AdminGendersController.php @@ -102,7 +102,6 @@ class AdminGendersController extends AdminController 'label' => $this->l('Name:'), 'name' => 'name', 'lang' => true, - 'attributeLang' => 'name', 'size' => 33, 'hint' => $this->l('Invalid characters:').' 0-9!<>,;?=+()@#"�{}_$%:', 'required' => true diff --git a/controllers/admin/AdminManufacturersController.php b/controllers/admin/AdminManufacturersController.php index 8739a469d..cd49b7eff 100644 --- a/controllers/admin/AdminManufacturersController.php +++ b/controllers/admin/AdminManufacturersController.php @@ -227,7 +227,6 @@ class AdminManufacturersControllerCore extends AdminController public function initForm() { - $lang_tags = 'short_description¤description¤meta_title¤meta_keywords¤meta_description'; $this->fields_form = array( 'tinymce' => true, 'legend' => array( @@ -248,7 +247,6 @@ class AdminManufacturersControllerCore extends AdminController 'label' => $this->l('Short description:'), 'name' => 'short_description', 'lang' => true, - 'attributeLang' => $lang_tags, 'cols' => 60, 'rows' => 10, 'class' => 'rte', @@ -259,7 +257,6 @@ class AdminManufacturersControllerCore extends AdminController 'label' => $this->l('Description:'), 'name' => 'description', 'lang' => true, - 'attributeLang' => $lang_tags, 'cols' => 60, 'rows' => 10, 'class' => 'rte', @@ -277,7 +274,6 @@ class AdminManufacturersControllerCore extends AdminController 'label' => $this->l('Meta title:'), 'name' => 'meta_title', 'lang' => true, - 'attributeLang' => $lang_tags, 'hint' => $this->l('Forbidden characters:').' <>;=#{}' ), array( @@ -285,7 +281,6 @@ class AdminManufacturersControllerCore extends AdminController 'label' => $this->l('Meta description:'), 'name' => 'meta_description', 'lang' => true, - 'attributeLang' => $lang_tags, 'hint' => $this->l('Forbidden characters:').' <>;=#{}' ), array( @@ -293,7 +288,6 @@ class AdminManufacturersControllerCore extends AdminController 'label' => $this->l('Meta keywords:'), 'name' => 'meta_keywords', 'lang' => true, - 'attributeLang' => $lang_tags, 'hint' => $this->l('Forbidden characters:').' <>;=#{}' ), array( diff --git a/controllers/admin/AdminMetaController.php b/controllers/admin/AdminMetaController.php index f9de19e79..349de8598 100644 --- a/controllers/admin/AdminMetaController.php +++ b/controllers/admin/AdminMetaController.php @@ -129,7 +129,6 @@ class AdminMetaControllerCore extends AdminController 'label' => $this->l('Page\'s title:'), 'name' => 'title', 'lang' => true, - 'attributeLang' => 'title', 'hint' => $this->l('Invalid characters:').' <>;=#{}', 'p' => $this->l('Title of this page'), 'size' => 30 @@ -139,7 +138,6 @@ class AdminMetaControllerCore extends AdminController 'label' => $this->l('Meta description:'), 'name' => 'description', 'lang' => true, - 'attributeLang' => 'description', 'hint' => $this->l('Invalid characters:').' <>;=#{}', 'p' => $this->l('A short description'), 'size' => 50 @@ -149,7 +147,6 @@ class AdminMetaControllerCore extends AdminController 'label' => $this->l('Meta keywords:'), 'name' => 'keywords', 'lang' => true, - 'attributeLang' => 'keywords', 'hint' => $this->l('Invalid characters:').' <>;=#{}', 'p' => $this->l('List of keywords'), 'size' => 50 @@ -159,7 +156,6 @@ class AdminMetaControllerCore extends AdminController 'label' => $this->l('Rewritten URL:'), 'name' => 'url_rewrite', 'lang' => true, - 'attributeLang' => 'url_rewrite', 'hint' => $this->l('Invalid characters:').' <>;=#{}', 'p' => $this->l('Example : "contacts" for http://mysite.com/shop/contacts to redirect to http://mysite.com/shop/contact-form.php'), 'size' => 50 diff --git a/controllers/admin/AdminOrderMessageController.php b/controllers/admin/AdminOrderMessageController.php index 4e9054882..8470ca1bb 100644 --- a/controllers/admin/AdminOrderMessageController.php +++ b/controllers/admin/AdminOrderMessageController.php @@ -70,7 +70,6 @@ class AdminOrderMessageController extends AdminController array( 'type' => 'text', 'lang' => true, - 'attributeLang' => 'name¤message', 'label' => $this->l('Name:'), 'name' => 'name', 'size' => 53, @@ -79,7 +78,6 @@ class AdminOrderMessageController extends AdminController array( 'type' => 'textarea', 'lang' => true, - 'attributeLang' => 'name¤message', 'label' => $this->l('Message:'), 'name' => 'message', 'cols' => 50, diff --git a/controllers/admin/AdminProfilesController.php b/controllers/admin/AdminProfilesController.php index bdfae46ee..0922d2b4e 100644 --- a/controllers/admin/AdminProfilesController.php +++ b/controllers/admin/AdminProfilesController.php @@ -55,7 +55,6 @@ class AdminProfilesControllerCore extends AdminController 'size' => 33, 'required' => true, 'lang' => true, - 'attributeLang' => 'name', ) ), 'submit' => array( diff --git a/controllers/admin/AdminQuickAccessesController.php b/controllers/admin/AdminQuickAccessesController.php index d65e57f8e..e5a88c7f0 100644 --- a/controllers/admin/AdminQuickAccessesController.php +++ b/controllers/admin/AdminQuickAccessesController.php @@ -77,7 +77,6 @@ class AdminQuickAccessesController extends AdminController 'label' => $this->l('Name:'), 'name' => 'name', 'lang' => true, - 'attributeLang' => 'name', 'size' => 33, 'maxlength' => 32, 'required' => true, diff --git a/controllers/admin/AdminStatusesController.php b/controllers/admin/AdminStatusesController.php index 6112c75f7..cedaa3f9c 100644 --- a/controllers/admin/AdminStatusesController.php +++ b/controllers/admin/AdminStatusesController.php @@ -190,7 +190,6 @@ class AdminStatusesControllerCore extends AdminController 'label' => $this->l('Status name:'), 'name' => 'name', 'lang' => true, - 'attributeLang' => 'name¤template', 'size' => 40, 'required' => true, 'hint' => $this->l('Invalid characters: numbers and').' !<>,;?=+()@#"�{}_$%:', @@ -289,7 +288,6 @@ class AdminStatusesControllerCore extends AdminController 'label' => $this->l('Template:'), 'name' => 'template', 'lang' => true, - 'attributeLang' => 'name¤template', 'options' => array( 'query' => $this->getTemplates($this->context->language->iso_code), 'id' => 'id', @@ -338,7 +336,6 @@ class AdminStatusesControllerCore extends AdminController 'label' => $this->l('Status name:'), 'name' => 'name', 'lang' => true, - 'attributeLang' => 'name¤template', 'size' => 40, 'required' => true, 'hint' => $this->l('Invalid characters: numbers and').' !<>,;?=+()@#"�{}_$%:', diff --git a/controllers/admin/AdminStockMvtController.php b/controllers/admin/AdminStockMvtController.php index b557c58ee..cfa144fa2 100644 --- a/controllers/admin/AdminStockMvtController.php +++ b/controllers/admin/AdminStockMvtController.php @@ -135,7 +135,6 @@ class AdminStockMvtControllerCore extends AdminController array( 'type' => 'text', 'lang' => true, - 'attributeLang' => 'name', 'label' => $this->l('Name:'), 'name' => 'name', 'size' => 50, diff --git a/controllers/admin/AdminSupplyOrdersController.php b/controllers/admin/AdminSupplyOrdersController.php index b80347863..4d42700ab 100644 --- a/controllers/admin/AdminSupplyOrdersController.php +++ b/controllers/admin/AdminSupplyOrdersController.php @@ -160,7 +160,6 @@ class AdminSupplyOrdersControllerCore extends AdminController array( 'type' => 'text', 'lang' => true, - 'attributeLang' => 'name', 'label' => $this->l('Name:'), 'name' => 'name', 'size' => 50, @@ -287,7 +286,6 @@ class AdminSupplyOrdersControllerCore extends AdminController array( 'type' => 'text', 'lang' => true, - 'attributeLang' => 'name', 'label' => $this->l('Name:'), 'name' => 'name', 'size' => 50, diff --git a/controllers/admin/AdminTabsController.php b/controllers/admin/AdminTabsController.php index 2c0e45a21..e2907981e 100644 --- a/controllers/admin/AdminTabsController.php +++ b/controllers/admin/AdminTabsController.php @@ -102,7 +102,6 @@ class AdminTabsControllerCore extends AdminController 'label' => $this->l('Name:'), 'name' => 'name', 'lang' => true, - 'attributeLang' => 'name', 'size' => 33, 'required' => true, 'hint' => $this->l('Invalid characters:').' <>;=#{}' @@ -222,7 +221,7 @@ class AdminTabsControllerCore extends AdminController return; } /* PrestaShop demo mode*/ - + if (($id_tab = (int)Tools::getValue('id_tab')) && ($direction = Tools::getValue('move')) && Validate::isLoadedObject($tab = new Tab($id_tab))) { if ($tab->move($direction))