From fea1a4452612b194dbf02baf237062616423c61b Mon Sep 17 00:00:00 2001
From: Natalia Momotenko <nmomotenko@ebay.com>
Date: Mon, 29 Jun 2015 16:47:36 +0300
Subject: [PATCH] MAGETWO-36133: Update Content in Magento 2 - Labels and
Titles
---
.../Product/Attribute/Set/Main/Formset.php | 2 +-
.../Product/Attribute/Set/Toolbar/Main.php | 2 +-
.../Attribute/Edit/Main/AbstractMain.php | 4 +-
.../Adminhtml/Attribute/Grid/AbstractGrid.php | 2 +-
.../Adminhtml/Report/Filter/Form/Coupon.php | 2 +-
.../SalesRule/Block/Adminhtml/Promo/Quote.php | 2 +-
.../Adminhtml/Promo/Quote/Edit/Tab/Main.php | 2 +-
.../Quote/Edit/Tab/Main/Renderer/Checkbox.php | 2 +-
.../Block/Adminhtml/Promo/Quote/Edit/Tabs.php | 2 +-
app/code/Magento/SalesRule/Model/Coupon.php | 2 +-
app/code/Magento/SalesRule/Model/Observer.php | 2 +-
.../Test/Unit/Model/ObserverTest.php | 2 +-
.../Magento/Widget/Block/Adminhtml/Widget.php | 2 +-
.../Widget/Block/Adminhtml/Widget/Form.php | 6 +--
.../Block/Adminhtml/Widget/Instance.php | 2 +-
.../Widget/Instance/Edit/Tab/Main.php | 4 +-
.../Widget/Instance/Edit/Tab/Properties.php | 4 +-
.../Adminhtml/Widget/Instance/Edit/Tabs.php | 2 +-
.../Widget/Block/Adminhtml/Widget/Options.php | 4 +-
.../adminhtml_widget_instance_block.xml | 4 +-
.../Magento/backend/web/css/styles-old.less | 2 +-
.../DeleteAttributeSetTest.php | 2 +-
.../Block/Adminhtml/Page/Edit/Tab/Content.php | 4 +-
.../SalesRule/Test/Repository/SalesRule.xml | 30 +++++------
.../TestCase/CreateSalesRuleEntityTest.xml | 52 +++++++++----------
.../TestCase/DeleteSalesRuleEntityTest.php | 2 +-
.../Framework/Data/Form/Element/Editor.php | 2 +-
.../plugins/magentowidget/editor_plugin.js | 2 +-
lib/web/mage/adminhtml/wysiwyg/widget.js | 2 +-
.../Setup/Fixtures/CartPriceRulesFixture.php | 4 +-
30 files changed, 78 insertions(+), 78 deletions(-)
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Main/Formset.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Main/Formset.php
index a9ebb98156f..ab4bcab4dbf 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Main/Formset.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Main/Formset.php
@@ -43,7 +43,7 @@ class Formset extends \Magento\Backend\Block\Widget\Form\Generic
/** @var \Magento\Framework\Data\Form $form */
$form = $this->_formFactory->create();
- $fieldset = $form->addFieldset('set_name', ['legend' => __('Edit Set Name')]);
+ $fieldset = $form->addFieldset('set_name', ['legend' => __('Edit Product Template Name')]);
$fieldset->addField(
'attribute_set_name',
'text',
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Toolbar/Main.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Toolbar/Main.php
index c98a4c62ab5..cedf419205b 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Toolbar/Main.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Toolbar/Main.php
@@ -27,7 +27,7 @@ class Main extends \Magento\Backend\Block\Template
'addButton',
'Magento\Backend\Block\Widget\Button',
[
- 'label' => __('Add New Set'),
+ 'label' => __('Add Product Template'),
'onclick' => 'setLocation(\'' . $this->getUrl('catalog/*/add') . '\')',
'class' => 'add primary add-set'
]
diff --git a/app/code/Magento/Eav/Block/Adminhtml/Attribute/Edit/Main/AbstractMain.php b/app/code/Magento/Eav/Block/Adminhtml/Attribute/Edit/Main/AbstractMain.php
index 2b6b39bc13c..d5badef446a 100644
--- a/app/code/Magento/Eav/Block/Adminhtml/Attribute/Edit/Main/AbstractMain.php
+++ b/app/code/Magento/Eav/Block/Adminhtml/Attribute/Edit/Main/AbstractMain.php
@@ -129,8 +129,8 @@ abstract class AbstractMain extends \Magento\Backend\Block\Widget\Form\Generic
'text',
[
'name' => 'frontend_label[0]',
- 'label' => __('Attribute Label'),
- 'title' => __('Attribute Label'),
+ 'label' => __('Default label'),
+ 'title' => __('Default label'),
'required' => true,
'value' => is_array($labels) ? $labels[0] : $labels
]
diff --git a/app/code/Magento/Eav/Block/Adminhtml/Attribute/Grid/AbstractGrid.php b/app/code/Magento/Eav/Block/Adminhtml/Attribute/Grid/AbstractGrid.php
index 06a3a253c83..5c54828b740 100644
--- a/app/code/Magento/Eav/Block/Adminhtml/Attribute/Grid/AbstractGrid.php
+++ b/app/code/Magento/Eav/Block/Adminhtml/Attribute/Grid/AbstractGrid.php
@@ -53,7 +53,7 @@ abstract class AbstractGrid extends \Magento\Backend\Block\Widget\Grid\Extended
$this->addColumn(
'frontend_label',
[
- 'header' => __('Attribute Label'),
+ 'header' => __('Default label'),
'sortable' => true,
'index' => 'frontend_label',
'header_css_class' => 'col-label',
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Report/Filter/Form/Coupon.php b/app/code/Magento/Sales/Block/Adminhtml/Report/Filter/Form/Coupon.php
index b67df217903..45be7873534 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Report/Filter/Form/Coupon.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Report/Filter/Form/Coupon.php
@@ -66,7 +66,7 @@ class Coupon extends \Magento\Sales\Block\Adminhtml\Report\Filter\Form
[
'name' => 'price_rule_type',
'options' => [__('Any'), __('Specified')],
- 'label' => __('Shopping Cart Price Rule')
+ 'label' => __('Cart Price Rule')
]
);
diff --git a/app/code/Magento/SalesRule/Block/Adminhtml/Promo/Quote.php b/app/code/Magento/SalesRule/Block/Adminhtml/Promo/Quote.php
index 121853269cd..281feda9d89 100644
--- a/app/code/Magento/SalesRule/Block/Adminhtml/Promo/Quote.php
+++ b/app/code/Magento/SalesRule/Block/Adminhtml/Promo/Quote.php
@@ -20,7 +20,7 @@ class Quote extends \Magento\Backend\Block\Widget\Grid\Container
protected function _construct()
{
$this->_controller = 'promo_quote';
- $this->_headerText = __('Shopping Cart Price Rules');
+ $this->_headerText = __('Cart Price Rules');
$this->_addButtonLabel = __('Add New Rule');
parent::_construct();
}
diff --git a/app/code/Magento/SalesRule/Block/Adminhtml/Promo/Quote/Edit/Tab/Main.php b/app/code/Magento/SalesRule/Block/Adminhtml/Promo/Quote/Edit/Tab/Main.php
index 8506d969356..230da7df62b 100644
--- a/app/code/Magento/SalesRule/Block/Adminhtml/Promo/Quote/Edit/Tab/Main.php
+++ b/app/code/Magento/SalesRule/Block/Adminhtml/Promo/Quote/Edit/Tab/Main.php
@@ -20,7 +20,7 @@ use Magento\SalesRule\Model\RuleFactory;
use Magento\Store\Model\System\Store;
/**
- * Shopping Cart Price Rule General Information Tab
+ * Cart Price Rule General Information Tab
*
* @author Magento Core Team <core@magentocommerce.com>
*/
diff --git a/app/code/Magento/SalesRule/Block/Adminhtml/Promo/Quote/Edit/Tab/Main/Renderer/Checkbox.php b/app/code/Magento/SalesRule/Block/Adminhtml/Promo/Quote/Edit/Tab/Main/Renderer/Checkbox.php
index 76ac8e98475..e7ec35b1947 100644
--- a/app/code/Magento/SalesRule/Block/Adminhtml/Promo/Quote/Edit/Tab/Main/Renderer/Checkbox.php
+++ b/app/code/Magento/SalesRule/Block/Adminhtml/Promo/Quote/Edit/Tab/Main/Renderer/Checkbox.php
@@ -6,7 +6,7 @@
namespace Magento\SalesRule\Block\Adminhtml\Promo\Quote\Edit\Tab\Main\Renderer;
/**
- * Renderer for specific checkbox that is used on Rule Information tab in Shopping cart price rules
+ * Renderer for specific checkbox that is used on Rule Information tab in Cart Price Rules
*
* @author Magento Core Team <core@magentocommerce.com>
*/
diff --git a/app/code/Magento/SalesRule/Block/Adminhtml/Promo/Quote/Edit/Tabs.php b/app/code/Magento/SalesRule/Block/Adminhtml/Promo/Quote/Edit/Tabs.php
index 62070dd971d..b30e2529a97 100644
--- a/app/code/Magento/SalesRule/Block/Adminhtml/Promo/Quote/Edit/Tabs.php
+++ b/app/code/Magento/SalesRule/Block/Adminhtml/Promo/Quote/Edit/Tabs.php
@@ -22,6 +22,6 @@ class Tabs extends \Magento\Backend\Block\Widget\Tabs
parent::_construct();
$this->setId('promo_catalog_edit_tabs');
$this->setDestElementId('edit_form');
- $this->setTitle(__('Shopping Cart Price Rule'));
+ $this->setTitle(__('Cart Price Rule'));
}
}
diff --git a/app/code/Magento/SalesRule/Model/Coupon.php b/app/code/Magento/SalesRule/Model/Coupon.php
index 09acbd16468..848c554be97 100644
--- a/app/code/Magento/SalesRule/Model/Coupon.php
+++ b/app/code/Magento/SalesRule/Model/Coupon.php
@@ -65,7 +65,7 @@ class Coupon extends \Magento\Framework\Model\AbstractModel
}
/**
- * Load Shopping Cart Price Rule by coupon code
+ * Load Cart Price Rule by coupon code
*
* @param string $couponCode
* @return $this
diff --git a/app/code/Magento/SalesRule/Model/Observer.php b/app/code/Magento/SalesRule/Model/Observer.php
index 1bf3e12e752..037e4d9c9d3 100644
--- a/app/code/Magento/SalesRule/Model/Observer.php
+++ b/app/code/Magento/SalesRule/Model/Observer.php
@@ -190,7 +190,7 @@ class Observer
if ($disabledRulesCount) {
$this->messageManager->addWarning(
__(
- '%1 Shopping Cart Price Rules based on "%2" attribute have been disabled.',
+ '%1 Cart Price Rules based on "%2" attribute have been disabled.',
$disabledRulesCount,
$attributeCode
)
diff --git a/app/code/Magento/SalesRule/Test/Unit/Model/ObserverTest.php b/app/code/Magento/SalesRule/Test/Unit/Model/ObserverTest.php
index 544ee949a91..08bb77809ba 100644
--- a/app/code/Magento/SalesRule/Test/Unit/Model/ObserverTest.php
+++ b/app/code/Magento/SalesRule/Test/Unit/Model/ObserverTest.php
@@ -339,7 +339,7 @@ class ObserverTest extends \PHPUnit_Framework_TestCase
$this->messageManager->expects($this->once())
->method('addWarning')
- ->with(sprintf('1 Shopping Cart Price Rules based on "%s" attribute have been disabled.', $attributeCode));
+ ->with(sprintf('1 Cart Price Rules based on "%s" attribute have been disabled.', $attributeCode));
}
public function testCatalogAttributeSaveAfter()
diff --git a/app/code/Magento/Widget/Block/Adminhtml/Widget.php b/app/code/Magento/Widget/Block/Adminhtml/Widget.php
index 66cfdbcbcf7..645be47b201 100644
--- a/app/code/Magento/Widget/Block/Adminhtml/Widget.php
+++ b/app/code/Magento/Widget/Block/Adminhtml/Widget.php
@@ -29,7 +29,7 @@ class Widget extends \Magento\Backend\Block\Widget\Form\Container
$this->removeButton('reset');
$this->removeButton('back');
- $this->buttonList->update('save', 'label', __('Insert Widget'));
+ $this->buttonList->update('save', 'label', __('Insert Frontend App'));
$this->buttonList->update('save', 'class', 'action-primary add-widget');
$this->buttonList->update('save', 'id', 'insert_button');
$this->buttonList->update('save', 'onclick', 'wWidget.insertWidget()');
diff --git a/app/code/Magento/Widget/Block/Adminhtml/Widget/Form.php b/app/code/Magento/Widget/Block/Adminhtml/Widget/Form.php
index 1cc0ff6ca5e..df16e1a46a5 100644
--- a/app/code/Magento/Widget/Block/Adminhtml/Widget/Form.php
+++ b/app/code/Magento/Widget/Block/Adminhtml/Widget/Form.php
@@ -46,14 +46,14 @@ class Form extends \Magento\Backend\Block\Widget\Form\Generic
/** @var \Magento\Framework\Data\Form $form */
$form = $this->_formFactory->create();
- $fieldset = $form->addFieldset('base_fieldset', ['legend' => __('Widget')]);
+ $fieldset = $form->addFieldset('base_fieldset', ['legend' => __('Frontend App')]);
$fieldset->addField(
'select_widget_type',
'select',
[
- 'label' => __('Widget Type'),
- 'title' => __('Widget Type'),
+ 'label' => __('Frontend App Type'),
+ 'title' => __('Frontend App Type'),
'name' => 'widget_type',
'required' => true,
'onchange' => "wWidget.validateField()",
diff --git a/app/code/Magento/Widget/Block/Adminhtml/Widget/Instance.php b/app/code/Magento/Widget/Block/Adminhtml/Widget/Instance.php
index babcfa86575..1883abb4a17 100644
--- a/app/code/Magento/Widget/Block/Adminhtml/Widget/Instance.php
+++ b/app/code/Magento/Widget/Block/Adminhtml/Widget/Instance.php
@@ -24,6 +24,6 @@ class Instance extends \Magento\Backend\Block\Widget\Grid\Container
$this->_controller = 'adminhtml_widget_instance';
$this->_headerText = __('Manage Widget Instances');
parent::_construct();
- $this->buttonList->update('add', 'label', __('Add New Widget Instance'));
+ $this->buttonList->update('add', 'label', __('Add Frontend App'));
}
}
diff --git a/app/code/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit/Tab/Main.php b/app/code/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit/Tab/Main.php
index d281c60358d..f154ee4386c 100644
--- a/app/code/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit/Tab/Main.php
+++ b/app/code/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit/Tab/Main.php
@@ -162,8 +162,8 @@ class Main extends \Magento\Backend\Block\Widget\Form\Generic implements \Magent
'text',
[
'name' => 'title',
- 'label' => __('Widget Instance Title'),
- 'title' => __('Widget Instance Title'),
+ 'label' => __('Frontend App Title'),
+ 'title' => __('Frontend App Title'),
'class' => '',
'required' => true
]
diff --git a/app/code/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit/Tab/Properties.php b/app/code/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit/Tab/Properties.php
index 0e8bf775c48..e138996deac 100644
--- a/app/code/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit/Tab/Properties.php
+++ b/app/code/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit/Tab/Properties.php
@@ -33,7 +33,7 @@ class Properties extends \Magento\Widget\Block\Adminhtml\Widget\Options implemen
*/
public function getTabLabel()
{
- return __('Widget Options');
+ return __('Frontend App Options');
}
/**
@@ -43,7 +43,7 @@ class Properties extends \Magento\Widget\Block\Adminhtml\Widget\Options implemen
*/
public function getTabTitle()
{
- return __('Widget Options');
+ return __('Frontend App Options');
}
/**
diff --git a/app/code/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit/Tabs.php b/app/code/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit/Tabs.php
index bac3bb511e0..4dbc2dc0535 100644
--- a/app/code/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit/Tabs.php
+++ b/app/code/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit/Tabs.php
@@ -23,6 +23,6 @@ class Tabs extends \Magento\Backend\Block\Widget\Tabs
parent::_construct();
$this->setId('widget_instace_tabs');
$this->setDestElementId('edit_form');
- $this->setTitle(__('Widget Instance'));
+ $this->setTitle(__('Frontend App'));
}
}
diff --git a/app/code/Magento/Widget/Block/Adminhtml/Widget/Options.php b/app/code/Magento/Widget/Block/Adminhtml/Widget/Options.php
index 2b8836b5333..b961c73a8b6 100644
--- a/app/code/Magento/Widget/Block/Adminhtml/Widget/Options.php
+++ b/app/code/Magento/Widget/Block/Adminhtml/Widget/Options.php
@@ -95,7 +95,7 @@ class Options extends \Magento\Backend\Block\Widget\Form\Generic
$this->setMainFieldsetHtmlId($mainFieldsetHtmlId);
$fieldset = $this->getForm()->addFieldset(
$mainFieldsetHtmlId,
- ['legend' => __('Widget Options'), 'class' => 'fieldset-wide']
+ ['legend' => __('Frontend App Options'), 'class' => 'fieldset-wide']
);
$this->setData('main_fieldset', $fieldset);
@@ -116,7 +116,7 @@ class Options extends \Magento\Backend\Block\Widget\Form\Generic
{
// get configuration node and translation helper
if (!$this->getWidgetType()) {
- throw new \Magento\Framework\Exception\LocalizedException(__('Please specify a Widget Type.'));
+ throw new \Magento\Framework\Exception\LocalizedException(__('Please specify a Frontend App Type.'));
}
$config = $this->_widget->getConfigAsObject($this->getWidgetType());
if (!$config->getParameters()) {
diff --git a/app/code/Magento/Widget/view/adminhtml/layout/adminhtml_widget_instance_block.xml b/app/code/Magento/Widget/view/adminhtml/layout/adminhtml_widget_instance_block.xml
index 9377c757242..c786e0479e2 100644
--- a/app/code/Magento/Widget/view/adminhtml/layout/adminhtml_widget_instance_block.xml
+++ b/app/code/Magento/Widget/view/adminhtml/layout/adminhtml_widget_instance_block.xml
@@ -27,7 +27,7 @@
</arguments>
<block class="Magento\Backend\Block\Widget\Grid\Column" as="instance_id">
<arguments>
- <argument name="header" xsi:type="string" translate="true">Widget ID</argument>
+ <argument name="header" xsi:type="string" translate="true">Frontend App ID</argument>
<argument name="index" xsi:type="string">instance_id</argument>
<argument name="column_css_class" xsi:type="string">col-id</argument>
<argument name="header_css_class" xsi:type="string">col-id</argument>
@@ -35,7 +35,7 @@
</block>
<block class="Magento\Backend\Block\Widget\Grid\Column" as="title">
<arguments>
- <argument name="header" xsi:type="string" translate="true">Widget Instance</argument>
+ <argument name="header" xsi:type="string" translate="true">Frontend App</argument>
<argument name="index" xsi:type="string">title</argument>
</arguments>
</block>
diff --git a/app/design/adminhtml/Magento/backend/web/css/styles-old.less b/app/design/adminhtml/Magento/backend/web/css/styles-old.less
index dbce802f726..cdeb2b777a1 100644
--- a/app/design/adminhtml/Magento/backend/web/css/styles-old.less
+++ b/app/design/adminhtml/Magento/backend/web/css/styles-old.less
@@ -3771,7 +3771,7 @@ input.no-display,
}
//
- // Shopping Cart Price Rule
+ // Cart Price Rule
// --------------------------------------
.fieldset .field-coupon_code,
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/DeleteAttributeSetTest.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/DeleteAttributeSetTest.php
index 5e88db04c3c..0ecf8bb1295 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/DeleteAttributeSetTest.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/DeleteAttributeSetTest.php
@@ -24,7 +24,7 @@ use Magento\Mtf\TestCase\Injectable;
* 1. Log in to Backend.
* 2. Navigate to Stores > Attributes > Product Template.
* 3. Open created Product Template.
- * 4. Click 'Delete Attribute Set' button.
+ * 4. Click 'Delete' button.
* 5. Perform all assertions.
*
* @group Product_Attributes_(MX)
diff --git a/dev/tests/functional/tests/app/Magento/Cms/Test/Block/Adminhtml/Page/Edit/Tab/Content.php b/dev/tests/functional/tests/app/Magento/Cms/Test/Block/Adminhtml/Page/Edit/Tab/Content.php
index 5ac929cb937..fd83e30ebbe 100644
--- a/dev/tests/functional/tests/app/Magento/Cms/Test/Block/Adminhtml/Page/Edit/Tab/Content.php
+++ b/dev/tests/functional/tests/app/Magento/Cms/Test/Block/Adminhtml/Page/Edit/Tab/Content.php
@@ -39,7 +39,7 @@ class Content extends Tab
protected $addVariableButton = ".add-variable";
/**
- * Insert Widget button selector.
+ * Insert Frontend App button selector.
*
* @var string
*/
@@ -73,7 +73,7 @@ class Content extends Tab
}
/**
- * Clicking in content tab 'Insert Widget' button.
+ * Clicking in content tab 'Insert Frontend App' button.
*
* @return void
*/
diff --git a/dev/tests/functional/tests/app/Magento/SalesRule/Test/Repository/SalesRule.xml b/dev/tests/functional/tests/app/Magento/SalesRule/Test/Repository/SalesRule.xml
index 9c1a431440b..652a596b0f3 100644
--- a/dev/tests/functional/tests/app/Magento/SalesRule/Test/Repository/SalesRule.xml
+++ b/dev/tests/functional/tests/app/Magento/SalesRule/Test/Repository/SalesRule.xml
@@ -8,7 +8,7 @@
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/Magento/Mtf/Repository/etc/repository.xsd">
<repository class="Magento\SalesRule\Test\Repository\SalesRule">
<dataset name="active_sales_rule_with_percent_price_discount_coupon">
- <field name="name" xsi:type="string">Shopping Cart Price Rule with Specific Coupon %isolation%</field>
+ <field name="name" xsi:type="string">Cart Price Rule with Specific Coupon %isolation%</field>
<field name="description" xsi:type="string">Description for Cart Price Rule</field>
<field name="is_active" xsi:type="string">Active</field>
<field name="website_ids" xsi:type="array">
@@ -22,8 +22,8 @@
<field name="simple_action" xsi:type="string">Percent of product price discount</field>
<field name="discount_amount" xsi:type="string">50</field>
<field name="store_labels" xsi:type="array">
- <item name="0" xsi:type="string">Shopping Cart price Rule with Specific Coupon</item>
- <item name="1" xsi:type="string">Shopping Cart price Rule with Specific Coupon</item>
+ <item name="0" xsi:type="string">Cart Price Rule with Specific Coupon</item>
+ <item name="1" xsi:type="string">Cart Price Rule with Specific Coupon</item>
</field>
</dataset>
@@ -43,7 +43,7 @@
</dataset>
<dataset name="active_sales_rule_with_fixed_price_discount_coupon">
- <field name="name" xsi:type="string">Shopping Cart Price Rule with Specific Coupon %isolation%</field>
+ <field name="name" xsi:type="string">Cart Price Rule with Specific Coupon %isolation%</field>
<field name="description" xsi:type="string">Description for Cart Price Rule</field>
<field name="is_active" xsi:type="string">Active</field>
<field name="website_ids" xsi:type="array">
@@ -58,13 +58,13 @@
<field name="simple_action" xsi:type="string">Fixed amount discount</field>
<field name="discount_amount" xsi:type="string">50</field>
<field name="store_labels" xsi:type="array">
- <item name="0" xsi:type="string">Shopping Cart price Rule with Specific Coupon</item>
- <item name="1" xsi:type="string">Shopping Cart price Rule with Specific Coupon</item>
+ <item name="0" xsi:type="string">Cart Price Rule with Specific Coupon</item>
+ <item name="1" xsi:type="string">Cart Price Rule with Specific Coupon</item>
</field>
</dataset>
<dataset name="active_sales_rule_for_retailer">
- <field name="name" xsi:type="string">Shopping Cart Price Rule %isolation%</field>
+ <field name="name" xsi:type="string">Cart Price Rule %isolation%</field>
<field name="description" xsi:type="string">Description for Cart Price Rule</field>
<field name="is_active" xsi:type="string">Active</field>
<field name="website_ids" xsi:type="array">
@@ -80,8 +80,8 @@
</dataset>
<dataset name="active_sales_rule_with_complex_conditions">
- <field name="name" xsi:type="string">Shopping Cart Price Rule with with complex conditions %isolation%</field>
- <field name="description" xsi:type="string">Shopping Cart Price Rule with with complex conditions</field>
+ <field name="name" xsi:type="string">Cart Price Rule with with complex conditions %isolation%</field>
+ <field name="description" xsi:type="string">Cart Price Rule with with complex conditions</field>
<field name="is_active" xsi:type="string">Active</field>
<field name="website_ids" xsi:type="array">
<item name="0" xsi:type="string">Main Website</item>
@@ -113,8 +113,8 @@
<field name="stop_rules_processing" xsi:type="string">Yes</field>
<field name="simple_free_shipping" xsi:type="string">For matching items only</field>
<field name="store_labels" xsi:type="array">
- <item name="0" xsi:type="string">Shopping Cart Price Rule with with complex conditions</item>
- <item name="1" xsi:type="string">Shopping Cart Price Rule with with complex conditions</item>
+ <item name="0" xsi:type="string">Cart Price Rule with with complex conditions</item>
+ <item name="1" xsi:type="string">Cart Price Rule with with complex conditions</item>
</field>
</dataset>
@@ -133,7 +133,7 @@
</dataset>
<dataset name="active_sales_rule_for_all_groups">
- <field name="name" xsi:type="string">Shopping Cart Price Rule with Specific Coupon %isolation%</field>
+ <field name="name" xsi:type="string">Cart Price Rule with Specific Coupon %isolation%</field>
<field name="description" xsi:type="string">Description for Cart Price Rule</field>
<field name="is_active" xsi:type="string">Active</field>
<field name="website_ids" xsi:type="array">
@@ -150,13 +150,13 @@
<field name="simple_action" xsi:type="string">Percent of product price discount</field>
<field name="discount_amount" xsi:type="string">50</field>
<field name="store_labels" xsi:type="array">
- <item name="0" xsi:type="string">Shopping Cart price Rule with Specific Coupon</item>
- <item name="1" xsi:type="string">Shopping Cart price Rule with Specific Coupon</item>
+ <item name="0" xsi:type="string">Cart Price Rule with Specific Coupon</item>
+ <item name="1" xsi:type="string">Cart Price Rule with Specific Coupon</item>
</field>
</dataset>
<dataset name="active_sales_rule_for_all_groups_no_coupon">
- <field name="name" xsi:type="string">Shopping Cart Price Rule without Coupon %isolation%</field>
+ <field name="name" xsi:type="string">Cart Price Rule without Coupon %isolation%</field>
<field name="description" xsi:type="string">Description for Cart Price Rule</field>
<field name="is_active" xsi:type="string">Active</field>
<field name="website_ids" xsi:type="array">
diff --git a/dev/tests/functional/tests/app/Magento/SalesRule/Test/TestCase/CreateSalesRuleEntityTest.xml b/dev/tests/functional/tests/app/Magento/SalesRule/Test/TestCase/CreateSalesRuleEntityTest.xml
index 0ff2064ad79..49441220295 100644
--- a/dev/tests/functional/tests/app/Magento/SalesRule/Test/TestCase/CreateSalesRuleEntityTest.xml
+++ b/dev/tests/functional/tests/app/Magento/SalesRule/Test/TestCase/CreateSalesRuleEntityTest.xml
@@ -8,8 +8,8 @@
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
<testCase name="Magento\SalesRule\Test\TestCase\CreateSalesRuleEntityTest">
<variation name="CreateSalesRuleEntityTestVariation1">
- <data name="salesRule/data/name" xsi:type="string">Shopping Cart Price Rule1 %isolation%</data>
- <data name="salesRule/data/description" xsi:type="string">Shopping Cart Price Rule Description %isolation%</data>
+ <data name="salesRule/data/name" xsi:type="string">Cart Price Rule1 %isolation%</data>
+ <data name="salesRule/data/description" xsi:type="string">Cart Price Rule Description %isolation%</data>
<data name="salesRule/data/is_active" xsi:type="string">Active</data>
<data name="salesRule/data/website_ids/website_0" xsi:type="string">Main Website</data>
<data name="salesRule/data/customer_group_ids/group_0" xsi:type="string">NOT LOGGED IN</data>
@@ -25,8 +25,8 @@
<constraint name="Magento\SalesRule\Test\Constraint\AssertCartPriceRuleConditionIsApplied" />
</variation>
<variation name="CreateSalesRuleEntityTestVariation2">
- <data name="salesRule/data/name" xsi:type="string">Shopping Cart Price Rule2 %isolation%</data>
- <data name="salesRule/data/description" xsi:type="string">Shopping Cart Price Rule Description %isolation%</data>
+ <data name="salesRule/data/name" xsi:type="string">Cart Price Rule2 %isolation%</data>
+ <data name="salesRule/data/description" xsi:type="string">Cart Price Rule Description %isolation%</data>
<data name="salesRule/data/is_active" xsi:type="string">Active</data>
<data name="salesRule/data/website_ids/website_0" xsi:type="string">Main Website</data>
<data name="salesRule/data/customer_group_ids/group_0" xsi:type="string">NOT LOGGED IN</data>
@@ -43,8 +43,8 @@
<constraint name="Magento\SalesRule\Test\Constraint\AssertCartPriceRuleConditionIsApplied" />
</variation>
<variation name="CreateSalesRuleEntityTestVariation3">
- <data name="salesRule/data/name" xsi:type="string">Shopping Cart Price Rule3 %isolation%</data>
- <data name="salesRule/data/description" xsi:type="string">Shopping Cart Price Rule Description %isolation%</data>
+ <data name="salesRule/data/name" xsi:type="string">Cart Price Rule3 %isolation%</data>
+ <data name="salesRule/data/description" xsi:type="string">Cart Price Rule Description %isolation%</data>
<data name="salesRule/data/is_active" xsi:type="string">Active</data>
<data name="salesRule/data/website_ids/website_0" xsi:type="string">Main Website</data>
<data name="salesRule/data/customer_group_ids/group_0" xsi:type="string">NOT LOGGED IN</data>
@@ -61,8 +61,8 @@
<constraint name="Magento\SalesRule\Test\Constraint\AssertCartPriceRuleConditionIsApplied" />
</variation>
<variation name="CreateSalesRuleEntityTestVariation4">
- <data name="salesRule/data/name" xsi:type="string">Shopping Cart Price Rule4 %isolation%</data>
- <data name="salesRule/data/description" xsi:type="string">Shopping Cart Price Rule Description %isolation%</data>
+ <data name="salesRule/data/name" xsi:type="string">Cart Price Rule4 %isolation%</data>
+ <data name="salesRule/data/description" xsi:type="string">Cart Price Rule Description %isolation%</data>
<data name="salesRule/data/is_active" xsi:type="string">Active</data>
<data name="salesRule/data/website_ids/website_0" xsi:type="string">Main Website</data>
<data name="salesRule/data/customer_group_ids/group_0" xsi:type="string">NOT LOGGED IN</data>
@@ -81,8 +81,8 @@
</variation>
<variation name="CreateSalesRuleEntityTestVariation5">
<data name="isLoggedIn" xsi:type="string">1</data>
- <data name="salesRule/data/name" xsi:type="string">Shopping Cart Price Rule5 %isolation%</data>
- <data name="salesRule/data/description" xsi:type="string">Shopping Cart Price Rule Description %isolation%</data>
+ <data name="salesRule/data/name" xsi:type="string">Cart Price Rule5 %isolation%</data>
+ <data name="salesRule/data/description" xsi:type="string">Cart Price Rule Description %isolation%</data>
<data name="salesRule/data/is_active" xsi:type="string">Active</data>
<data name="salesRule/data/website_ids/website_0" xsi:type="string">Main Website</data>
<data name="salesRule/data/customer_group_ids/group_0" xsi:type="string">General</data>
@@ -103,8 +103,8 @@
<data name="address/data/postcode" xsi:type="string">95814</data>
<data name="shipping/shipping_service" xsi:type="string">Flat Rate</data>
<data name="shipping/shipping_method" xsi:type="string">Fixed</data>
- <data name="salesRule/data/name" xsi:type="string">Shopping Cart Price Rule6 %isolation%</data>
- <data name="salesRule/data/description" xsi:type="string">Shopping Cart Price Rule Description %isolation%</data>
+ <data name="salesRule/data/name" xsi:type="string">Cart Price Rule6 %isolation%</data>
+ <data name="salesRule/data/description" xsi:type="string">Cart Price Rule Description %isolation%</data>
<data name="salesRule/data/is_active" xsi:type="string">Active</data>
<data name="salesRule/data/website_ids/website_0" xsi:type="string">Main Website</data>
<data name="salesRule/data/customer_group_ids/group_0" xsi:type="string">NOT LOGGED IN</data>
@@ -126,8 +126,8 @@
<data name="address/data/postcode" xsi:type="string">95814</data>
<data name="shipping/shipping_service" xsi:type="string">Flat Rate</data>
<data name="shipping/shipping_method" xsi:type="string">Fixed</data>
- <data name="salesRule/data/name" xsi:type="string">Shopping Cart Price Rule7 %isolation%</data>
- <data name="salesRule/data/description" xsi:type="string">Shopping Cart Price Rule Description %isolation%</data>
+ <data name="salesRule/data/name" xsi:type="string">Cart Price Rule7 %isolation%</data>
+ <data name="salesRule/data/description" xsi:type="string">Cart Price Rule Description %isolation%</data>
<data name="salesRule/data/is_active" xsi:type="string">Active</data>
<data name="salesRule/data/website_ids/website_0" xsi:type="string">Main Website</data>
<data name="salesRule/data/customer_group_ids/group_0" xsi:type="string">NOT LOGGED IN</data>
@@ -145,8 +145,8 @@
<constraint name="Magento\SalesRule\Test\Constraint\AssertCartPriceRuleFreeShippingIsApplied" />
</variation>
<variation name="CreateSalesRuleEntityTestVariation8">
- <data name="salesRule/data/name" xsi:type="string">Shopping Cart Price Rule8 %isolation%</data>
- <data name="salesRule/data/description" xsi:type="string">Shopping Cart Price Rule Description %isolation%</data>
+ <data name="salesRule/data/name" xsi:type="string">Cart Price Rule8 %isolation%</data>
+ <data name="salesRule/data/description" xsi:type="string">Cart Price Rule Description %isolation%</data>
<data name="salesRule/data/is_active" xsi:type="string">Active</data>
<data name="salesRule/data/website_ids/website_0" xsi:type="string">Main Website</data>
<data name="salesRule/data/customer_group_ids/group_0" xsi:type="string">NOT LOGGED IN</data>
@@ -164,8 +164,8 @@
<constraint name="Magento\SalesRule\Test\Constraint\AssertCartPriceRuleConditionIsApplied" />
</variation>
<variation name="CreateSalesRuleEntityTestVariation9">
- <data name="salesRule/data/name" xsi:type="string">Shopping Cart Price Rule9 %isolation%</data>
- <data name="salesRule/data/description" xsi:type="string">Shopping Cart Price Rule Description %isolation%</data>
+ <data name="salesRule/data/name" xsi:type="string">Cart Price Rule9 %isolation%</data>
+ <data name="salesRule/data/description" xsi:type="string">Cart Price Rule Description %isolation%</data>
<data name="salesRule/data/is_active" xsi:type="string">Active</data>
<data name="salesRule/data/website_ids/website_0" xsi:type="string">Main Website</data>
<data name="salesRule/data/customer_group_ids/group_0" xsi:type="string">NOT LOGGED IN</data>
@@ -182,8 +182,8 @@
<constraint name="Magento\SalesRule\Test\Constraint\AssertCartPriceRuleConditionIsNotApplied" />
</variation>
<variation name="CreateSalesRuleEntityTestVariation10">
- <data name="salesRule/data/name" xsi:type="string">Shopping Cart Price Rule10 %isolation%</data>
- <data name="salesRule/data/description" xsi:type="string">Shopping Cart Price Rule Description %isolation%</data>
+ <data name="salesRule/data/name" xsi:type="string">Cart Price Rule10 %isolation%</data>
+ <data name="salesRule/data/description" xsi:type="string">Cart Price Rule Description %isolation%</data>
<data name="salesRule/data/is_active" xsi:type="string">Active</data>
<data name="salesRule/data/website_ids/website_0" xsi:type="string">Main Website</data>
<data name="salesRule/data/customer_group_ids/group_0" xsi:type="string">NOT LOGGED IN</data>
@@ -200,8 +200,8 @@
<constraint name="Magento\SalesRule\Test\Constraint\AssertCartPriceRuleConditionIsApplied" />
</variation>
<variation name="CreateSalesRuleEntityTestVariation11">
- <data name="salesRule/data/name" xsi:type="string">Shopping Cart Price Rule11 %isolation%</data>
- <data name="salesRule/data/description" xsi:type="string">Shopping Cart Price Rule Description %isolation%</data>
+ <data name="salesRule/data/name" xsi:type="string">Cart Price Rule11 %isolation%</data>
+ <data name="salesRule/data/description" xsi:type="string">Cart Price Rule Description %isolation%</data>
<data name="salesRule/data/is_active" xsi:type="string">Active</data>
<data name="salesRule/data/website_ids/website_0" xsi:type="string">Main Website</data>
<data name="salesRule/data/customer_group_ids/group_0" xsi:type="string">NOT LOGGED IN</data>
@@ -224,8 +224,8 @@
<data name="address/data/postcode" xsi:type="string">95814</data>
<data name="shipping/shipping_service" xsi:type="string">Flat Rate</data>
<data name="shipping/shipping_method" xsi:type="string">Fixed</data>
- <data name="salesRule/data/name" xsi:type="string">Shopping Cart Price Rule12 %isolation%</data>
- <data name="salesRule/data/description" xsi:type="string">Shopping Cart Price Rule Description %isolation%</data>
+ <data name="salesRule/data/name" xsi:type="string">Cart Price Rule12 %isolation%</data>
+ <data name="salesRule/data/description" xsi:type="string">Cart Price Rule Description %isolation%</data>
<data name="salesRule/data/is_active" xsi:type="string">Active</data>
<data name="salesRule/data/website_ids/website_0" xsi:type="string">Main Website</data>
<data name="salesRule/data/customer_group_ids/group_0" xsi:type="string">NOT LOGGED IN</data>
@@ -243,8 +243,8 @@
<constraint name="Magento\SalesRule\Test\Constraint\AssertCartPriceRuleConditionIsApplied" />
</variation>
<variation name="CreateSalesRuleEntityTestVariation13">
- <data name="salesRule/data/name" xsi:type="string">Shopping Cart Price Rule13 %isolation%</data>
- <data name="salesRule/data/description" xsi:type="string">Shopping Cart Price Rule Description %isolation%</data>
+ <data name="salesRule/data/name" xsi:type="string">Cart Price Rule13 %isolation%</data>
+ <data name="salesRule/data/description" xsi:type="string">Cart Price Rule Description %isolation%</data>
<data name="salesRule/data/is_active" xsi:type="string">Active</data>
<data name="salesRule/data/website_ids/website_0" xsi:type="string">Main Website</data>
<data name="salesRule/data/customer_group_ids/group_0" xsi:type="string">NOT LOGGED IN</data>
diff --git a/dev/tests/functional/tests/app/Magento/SalesRule/Test/TestCase/DeleteSalesRuleEntityTest.php b/dev/tests/functional/tests/app/Magento/SalesRule/Test/TestCase/DeleteSalesRuleEntityTest.php
index 3dcf7ad8e3a..39acead1497 100644
--- a/dev/tests/functional/tests/app/Magento/SalesRule/Test/TestCase/DeleteSalesRuleEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/SalesRule/Test/TestCase/DeleteSalesRuleEntityTest.php
@@ -13,7 +13,7 @@ use Magento\Mtf\TestCase\Injectable;
/**
* Precondition:
- * 1. Several Shopping Cart Price Rules are created.
+ * 1. Several Cart Price Rules are created.
*
* Steps:
* 1. Login to backend.
diff --git a/lib/internal/Magento/Framework/Data/Form/Element/Editor.php b/lib/internal/Magento/Framework/Data/Form/Element/Editor.php
index 7ddcc639e8e..d48d194fade 100644
--- a/lib/internal/Magento/Framework/Data/Form/Element/Editor.php
+++ b/lib/internal/Magento/Framework/Data/Form/Element/Editor.php
@@ -252,7 +252,7 @@ class Editor extends Textarea
if ($this->getConfig('add_widgets')) {
$buttonsHtml .= $this->_getButtonHtml(
[
- 'title' => $this->translate('Insert Widget...'),
+ 'title' => $this->translate('Insert Frontend App...'),
'onclick' => "widgetTools.openDialog('" . $this->getConfig(
'widget_window_url'
) . "widget_target_id/" . $this->getHtmlId() . "')",
diff --git a/lib/web/mage/adminhtml/wysiwyg/tiny_mce/plugins/magentowidget/editor_plugin.js b/lib/web/mage/adminhtml/wysiwyg/tiny_mce/plugins/magentowidget/editor_plugin.js
index d4d7f460f30..930dc43f88a 100644
--- a/lib/web/mage/adminhtml/wysiwyg/tiny_mce/plugins/magentowidget/editor_plugin.js
+++ b/lib/web/mage/adminhtml/wysiwyg/tiny_mce/plugins/magentowidget/editor_plugin.js
@@ -5,7 +5,7 @@
tinyMCE.addI18n({en:{
magentowidget:
{
- insert_widget : "Insert Widget"
+ insert_widget : "Insert Frontend App"
}
}});
diff --git a/lib/web/mage/adminhtml/wysiwyg/widget.js b/lib/web/mage/adminhtml/wysiwyg/widget.js
index 354e7e4381d..363da71f2d9 100644
--- a/lib/web/mage/adminhtml/wysiwyg/widget.js
+++ b/lib/web/mage/adminhtml/wysiwyg/widget.js
@@ -53,7 +53,7 @@ define([
var oThis = this;
this.dialogWindow = jQuery('<div/>').dialog({
autoOpen: false,
- title: jQuery.mage.__('Insert Widget...'),
+ title: jQuery.mage.__('Insert Frontend App...'),
modal: true,
resizable: false,
width: '75%',
diff --git a/setup/src/Magento/Setup/Fixtures/CartPriceRulesFixture.php b/setup/src/Magento/Setup/Fixtures/CartPriceRulesFixture.php
index 3cb6ab044b0..a27a72e7af0 100644
--- a/setup/src/Magento/Setup/Fixtures/CartPriceRulesFixture.php
+++ b/setup/src/Magento/Setup/Fixtures/CartPriceRulesFixture.php
@@ -65,7 +65,7 @@ class CartPriceRulesFixture extends Fixture
$idField = $model->getIdFieldName();
for ($i = 0; $i < $cartPriceRulesCount; $i++) {
- $ruleName = sprintf('Shopping Cart Price Rule %1$d', $i);
+ $ruleName = sprintf('Cart Price Rule %1$d', $i);
$data = [
$idField => null,
'product_ids' => '',
@@ -182,7 +182,7 @@ class CartPriceRulesFixture extends Fixture
*/
public function getActionTitle()
{
- return 'Generating shopping cart price rules';
+ return 'Generating Cart Price Rules';
}
/**
--
GitLab