From 14cc781c5f39aa8bacd5b71ec9c8e1cc0a7e52d7 Mon Sep 17 00:00:00 2001 From: fernandofauth Date: Fri, 7 Jul 2017 14:57:27 -0300 Subject: [PATCH 1/5] Fixed bookmark translation on product list page --- .../view/adminhtml/ui_component/product_listing.xml | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/app/code/Magento/Catalog/view/adminhtml/ui_component/product_listing.xml b/app/code/Magento/Catalog/view/adminhtml/ui_component/product_listing.xml index f7475d0bb8168..93b131cbc5afa 100644 --- a/app/code/Magento/Catalog/view/adminhtml/ui_component/product_listing.xml +++ b/app/code/Magento/Catalog/view/adminhtml/ui_component/product_listing.xml @@ -33,7 +33,17 @@ true - + + + + Magento_Ui/js/grid/controls/bookmarks/bookmarks + dataGridActions + + localStorage + + + + From a79cff00eed2fe5b7a0701e0ea063ba51ae399d1 Mon Sep 17 00:00:00 2001 From: fernandofauth Date: Fri, 7 Jul 2017 19:50:41 -0300 Subject: [PATCH 2/5] Fixed: Product attributes labels and product attribute group label. --- .../Catalog/Ui/DataProvider/Product/Form/Modifier/Eav.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Eav.php b/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Eav.php index 176e578d7a73f..1e5a069583e5a 100755 --- a/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Eav.php +++ b/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Eav.php @@ -244,7 +244,7 @@ public function modifyMeta(array $meta) if ($attributes) { $meta[$groupCode]['children'] = $this->getAttributesMeta($attributes, $groupCode); $meta[$groupCode]['arguments']['data']['config']['componentType'] = Fieldset::NAME; - $meta[$groupCode]['arguments']['data']['config']['label'] = __('%1', $group->getAttributeGroupName()); + $meta[$groupCode]['arguments']['data']['config']['label'] = __('%1', __($group->getAttributeGroupName())); $meta[$groupCode]['arguments']['data']['config']['collapsible'] = true; $meta[$groupCode]['arguments']['data']['config']['dataScope'] = self::DATA_SCOPE_PRODUCT; $meta[$groupCode]['arguments']['data']['config']['sortOrder'] = @@ -546,7 +546,7 @@ public function setupAttributeMeta(ProductAttributeInterface $attribute, $groupC 'required' => $attribute->getIsRequired(), 'notice' => $attribute->getNote(), 'default' => $attribute->getDefaultValue(), - 'label' => $attribute->getDefaultFrontendLabel(), + 'label' => __($attribute->getDefaultFrontendLabel()), 'code' => $attribute->getAttributeCode(), 'source' => $groupCode, 'scopeLabel' => $this->getScopeLabel($attribute), @@ -650,7 +650,7 @@ public function setupAttributeContainerMeta(ProductAttributeInterface $attribute 'formElement' => 'container', 'componentType' => 'container', 'breakLine' => false, - 'label' => $attribute->getDefaultFrontendLabel(), + 'label' => __($attribute->getDefaultFrontendLabel()), 'required' => $attribute->getIsRequired(), ] ); From ffadb4e0a2cab96cc65c8eecc73b5bb460526d1f Mon Sep 17 00:00:00 2001 From: fernandofauth Date: Mon, 10 Jul 2017 00:12:02 -0300 Subject: [PATCH 3/5] Add translate parameter --- .../ui_component/catalog_rule_form.xml | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/app/code/Magento/CatalogRule/view/adminhtml/ui_component/catalog_rule_form.xml b/app/code/Magento/CatalogRule/view/adminhtml/ui_component/catalog_rule_form.xml index d5f0f0db2d2e6..66fc7bdffc382 100644 --- a/app/code/Magento/CatalogRule/view/adminhtml/ui_component/catalog_rule_form.xml +++ b/app/code/Magento/CatalogRule/view/adminhtml/ui_component/catalog_rule_form.xml @@ -72,7 +72,7 @@ - Rule Name + Rule Name true text input @@ -87,7 +87,7 @@ - Description + Description true text textarea @@ -99,7 +99,7 @@ - Status + Status true number select @@ -121,7 +121,7 @@ - Websites + Websites number multiselect @@ -140,7 +140,7 @@ - Customer Groups + Customer Groups number multiselect @@ -155,7 +155,7 @@ - From + From true text date @@ -170,7 +170,7 @@ - To + To true text date @@ -185,7 +185,7 @@ - Priority + Priority text input catalog_rule @@ -205,7 +205,7 @@ - Apply + Apply number select catalog_rule @@ -274,7 +274,7 @@ - Discount Amount + Discount Amount text input catalog_rule @@ -288,7 +288,7 @@ - Discard subsequent rules + Discard subsequent rules bool number select @@ -309,4 +309,4 @@ - + \ No newline at end of file From d1a719850c635dcc1dfb7a896d3910372c66d343 Mon Sep 17 00:00:00 2001 From: fernandofauth Date: Mon, 10 Jul 2017 13:20:08 -0300 Subject: [PATCH 4/5] Add translate parameter on labels of design_config_form.xml file --- .../view/adminhtml/ui_component/design_config_form.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/code/Magento/Backend/view/adminhtml/ui_component/design_config_form.xml b/app/code/Magento/Backend/view/adminhtml/ui_component/design_config_form.xml index deb3a05f352c3..44a5fe307eff1 100644 --- a/app/code/Magento/Backend/view/adminhtml/ui_component/design_config_form.xml +++ b/app/code/Magento/Backend/view/adminhtml/ui_component/design_config_form.xml @@ -43,7 +43,7 @@ dynamicRows record Remove - Add New User Agent Rule + Add New User Agent Rule false false @@ -67,7 +67,7 @@ text search false - Search String + Search String false @@ -80,7 +80,7 @@ text value false - Theme Name + Theme Name false @@ -91,7 +91,7 @@ actionDelete text false - Actions + Actions 50 data-grid-actions-cell Magento_Backend/dynamic-rows/cells/action-delete From 5aadc6c2615ceb5587458342f073661978aa4c6f Mon Sep 17 00:00:00 2001 From: fernandofauth Date: Mon, 10 Jul 2017 13:22:49 -0300 Subject: [PATCH 5/5] changed the 'echo' adding the '___()' to enable the titles translation --- app/code/Magento/Theme/view/adminhtml/templates/title.phtml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/Theme/view/adminhtml/templates/title.phtml b/app/code/Magento/Theme/view/adminhtml/templates/title.phtml index 3907203fde293..6e49ac4ec17ef 100644 --- a/app/code/Magento/Theme/view/adminhtml/templates/title.phtml +++ b/app/code/Magento/Theme/view/adminhtml/templates/title.phtml @@ -15,6 +15,6 @@ $title = $block->escapeHtml($block->getPageTitle()); ?>
-

>

+

>

getChildHtml(); ?>