Skip to content

Commit 463c715

Browse files
author
Momotenko,Natalia(nmomotenko)
committed
Merge pull request #343 from magento-webdev/PR
[UI] Sprint 38 + Bugfixes
2 parents 86674b4 + 7411e99 commit 463c715

File tree

212 files changed

+1059
-674
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

212 files changed

+1059
-674
lines changed

‎Gruntfile.js

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -68,12 +68,17 @@ module.exports = function (grunt) {
6868
'less:luma',
6969
'less:backend'
7070
],
71+
7172
/**
7273
* Documentation
7374
*/
7475
documentation: [
76+
'replace:documentation',
7577
'less:documentation',
7678
'styledocco:documentation',
79+
'usebanner:documentationCss',
80+
'usebanner:documentationLess',
81+
'usebanner:documentationHtml',
7782
'clean:var',
7883
'clean:pub'
7984
],
@@ -82,12 +87,6 @@ module.exports = function (grunt) {
8287
'mage-minify:legacy'
8388
],
8489

85-
'documentation-banners': [
86-
'usebanner:documentationCss',
87-
'usebanner:documentationLess',
88-
'usebanner:documentationHtml'
89-
],
90-
9190
spec: function (theme) {
9291
var runner = require('./dev/tests/js/jasmine/spec_runner');
9392

‎app/code/Magento/Backend/Controller/Adminhtml/Index/GlobalSearch.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ public function execute()
4848
$items[] = [
4949
'id' => 'error',
5050
'type' => __('Error'),
51-
'name' => __('Access Denied'),
51+
'name' => __('Access Denied.'),
5252
'description' => __('You need more permissions to do this.'),
5353
];
5454
} else {

‎app/code/Magento/Backend/view/adminhtml/templates/admin/access_denied.phtml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@
1515
<h1 class="page-heading"><?php echo __('Access denied') ?></h1>
1616
<?php if (!$block->hasAvailableResources()): ?>
1717
<p>
18-
<?php echo __('Please try to log out and sign in again.') ?><br/>
18+
<?php echo __('Please try to sign out and sign in again.') ?><br/>
1919
<?php echo __('If you continue to receive this message, please contact the store owner.') ?>
2020
</p>
2121
<?php else: ?>
22-
<p><?php echo __('Access denied.') ?></p>
22+
<p><?php echo __('You need more permissions to access this.') ?></p>
2323
<?php endif?>

‎app/code/Magento/Backend/view/adminhtml/templates/media/uploader.phtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ require([
7373
$('#' + data.fileId)
7474
.delay(2000)
7575
.hide('highlight');
76-
alert($.mage.__('File extension not known or unsupported type.'));
76+
alert($.mage.__('We don\'t recognize or support this file extension type.'));
7777
}
7878
$('#' + data.fileId).remove();
7979
},

‎app/code/Magento/Backend/view/adminhtml/templates/menu.phtml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88

99
?>
1010

11-
1211
<nav data-mage-init='{"globalNavigation": {}}' class="admin__menu" role="navigation">
1312
<?php echo $block->renderNavigation($block->getMenuModel(), 0, 12); ?>
1413
</nav>

‎app/code/Magento/Bundle/Model/Product/Type.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1319,7 +1319,7 @@ protected function checkIsResult($_result)
13191319

13201320
if (!isset($_result[0])) {
13211321
throw new \Magento\Framework\Exception\LocalizedException(
1322-
__('We cannot add this item to your shopping cart.')
1322+
__('We can\'t add this item to your cart right now.')
13231323
);
13241324
}
13251325
}

‎app/code/Magento/Bundle/Test/Unit/Model/Product/TypeTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -695,7 +695,7 @@ function ($key) use ($optionCollection, $selectionCollection) {
695695
->willReturn(3.14);
696696

697697
$result = $this->model->prepareForCartAdvanced($buyRequest, $product);
698-
$this->assertEquals('We cannot add this item to your shopping cart.', $result);
698+
$this->assertEquals('We can\'t add this item to your cart right now.', $result);
699699
}
700700

701701
/**

‎app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit/Tab/Advanced.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ protected function _prepareForm()
8585
'label' => __('Attribute Code'),
8686
'title' => __('Attribute Code'),
8787
'note' => __(
88-
'For internal use. Must be unique with no spaces. Maximum length of attribute code must be less than %1 symbols',
88+
'This is used internally. Make sure you don\'t use spaces or more than %1 symbols.',
8989
\Magento\Eav\Model\Entity\Attribute::ATTRIBUTE_CODE_MAX_LENGTH
9090
),
9191
'class' => $validateClass

‎app/code/Magento/Catalog/Block/Product/View/Options/Type/Select.php

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -89,15 +89,16 @@ public function getValuesHtml()
8989
$type = 'radio';
9090
$class = 'radio admin__control-radio';
9191
if (!$_option->getIsRequire()) {
92-
$selectHtml .= '<div class="field admin__field choice"><input type="radio" id="options_' .
92+
$selectHtml .= '<div class="field choice admin__field admin__field-option">' .
93+
'<input type="radio" id="options_' .
9394
$_option->getId() .
9495
'" class="' .
9596
$class .
9697
' product-custom-option" name="options[' .
9798
$_option->getId() .
9899
']"' .
99100
($this->getSkipJsReloadPrice() ? '' : ' onclick="opConfig.reloadPrice()"') .
100-
' value="" checked="checked" /><label class="label" for="options_' .
101+
' value="" checked="checked" /><label class="label admin__field-label" for="options_' .
101102
$_option->getId() .
102103
'"><span>' .
103104
__('None') . '</span></label></div>';
@@ -153,7 +154,7 @@ public function getValuesHtml()
153154
' price="' .
154155
$this->pricingHelper->currencyByStore($_value->getPrice(true), $store, false) .
155156
'" />' .
156-
'<label class="label" for="options_' .
157+
'<label class="label admin__field-label" for="options_' .
157158
$_option->getId() .
158159
'_' .
159160
$count .

‎app/code/Magento/Catalog/Controller/Adminhtml/Product/Set/Delete.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ public function execute()
3939
$this->messageManager->addSuccess(__('The attribute set has been removed.'));
4040
$resultRedirect->setPath('catalog/*/');
4141
} catch (\Exception $e) {
42-
$this->messageManager->addError(__('An error occurred while deleting this set.'));
42+
$this->messageManager->addError(__('We can\'t delete this set right now.'));
4343
$resultRedirect->setUrl($this->_redirect->getRedirectUrl($this->getUrl('*')));
4444
}
4545
return $resultRedirect;

‎app/code/Magento/Catalog/Model/Attribute/Backend/Startdate.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ public function validate($object)
9696
$maxValue = $date->timestamp($maxDate);
9797

9898
if ($value > $maxValue) {
99-
$message = __('The From Date value should be less than or equal to the To Date value.');
99+
$message = __('Make sure the To Date is later than or the same as the From Date.');
100100
$eavExc = new \Magento\Eav\Model\Entity\Attribute\Exception($message);
101101
$eavExc->setAttributeCode($attr->getName());
102102
throw $eavExc;

‎app/code/Magento/Catalog/view/adminhtml/web/catalog/base-image-uploader.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ define([
124124
if (!data.result.error) {
125125
$galleryContainer.trigger('addItem', data.result);
126126
} else {
127-
alert($.mage.__('File extension not known or unsupported type.'));
127+
alert($.mage.__('We don\'t recognize or support this file extension type.'));
128128
}
129129
},
130130
add: function (event, data) {

‎app/code/Magento/Catalog/view/frontend/templates/product/compare/list.phtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@
8080
<?php if ($this->helper('Magento\Wishlist\Helper\Data')->isAllow()) : ?>
8181
<div class="secondary-addto-links actions-secondary" data-role="add-to-links">
8282
<a href="#" data-post='<?php echo $block->getAddToWishlistParams($_item); ?>' class="action towishlist" data-action="add-to-wishlist">
83-
<span><?php echo __('Add to Wishlist') ?></span>
83+
<span><?php echo __('Add to Wish List') ?></span>
8484
</a>
8585
</div>
8686
<?php endif; ?>

‎app/code/Magento/Catalog/view/frontend/templates/product/list.phtml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -96,12 +96,12 @@ $imageBlock = $block->getLayout()->createBlock('Magento\Catalog\Block\Product\I
9696
<?php if ($this->helper('Magento\Wishlist\Helper\Data')->isAllow()): ?>
9797
<a href="#"
9898
class="action towishlist"
99-
title="<?php echo $block->escapeHtml(__('Add to Wishlist')); ?>"
100-
aria-label="<?php echo $block->escapeHtml(__('Add to Wishlist')); ?>"
99+
title="<?php echo $block->escapeHtml(__('Add to Wish List')); ?>"
100+
aria-label="<?php echo $block->escapeHtml(__('Add to Wish List')); ?>"
101101
data-post='<?php echo $block->getAddToWishlistParams($_product); ?>'
102102
data-action="add-to-wishlist"
103103
role="button">
104-
<span><?php echo __('Add to Wishlist') ?></span>
104+
<span><?php echo __('Add to Wish List') ?></span>
105105
</a>
106106
<?php endif; ?>
107107
<?php

‎app/code/Magento/Catalog/view/frontend/templates/product/list/items.phtml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -251,8 +251,8 @@ switch ($type = $block->getType()) {
251251
<?php if ($showWishlist || $showCompare): ?>
252252
<div class="secondary-addto-links actions-secondary" data-role="add-to-links">
253253
<?php if ($this->helper('Magento\Wishlist\Helper\Data')->isAllow() && $showWishlist): ?>
254-
<a href="#" data-post='<?php echo $block->getAddToWishlistParams($_item); ?>' class="action towishlist" data-action="add-to-wishlist" title="<?php echo __('Add to Wishlist') ?>">
255-
<span><?php echo __('Add to Wishlist') ?></span>
254+
<a href="#" data-post='<?php echo $block->getAddToWishlistParams($_item); ?>' class="action towishlist" data-action="add-to-wishlist" title="<?php echo __('Add to Wish List') ?>">
255+
<span><?php echo __('Add to Wish List') ?></span>
256256
</a>
257257
<?php endif; ?>
258258
<?php if ($block->getAddToCompareUrl() && $showCompare): ?>

‎app/code/Magento/Catalog/view/frontend/templates/product/listing.phtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ $imageBlock = $block->getLayout()->createBlock('Magento\Catalog\Block\Product\I
7171

7272
$info['links'] = '<div class="product links" data-role="add-to-links">'
7373
. '<a href="#" data-post=\'' . $this->helper('Magento\Wishlist\Helper\Data')->getAddParams($_product) . '\' class="action towishlist" data-action="add-to-wishlist">'
74-
. '<span>' . __('Add to Wishlist') . '</span></a>'
74+
. '<span>' . __('Add to Wish List') . '</span></a>'
7575
. '<a href="' . $block->getAddToCompareUrl($_product) . '" class="action tocompare">'
7676
. '<span>' . __('Add to Compare') . '</span></a></div>';
7777
$info['actions'] = '<div class="product action">' . $info['button'] . $info['links'] . '</div>';

‎app/code/Magento/Catalog/view/frontend/templates/product/view/addto.phtml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ $compareHelper = $this->helper('Magento\Catalog\Helper\Product\Compare');
1818
<?php if ($this->helper('Magento\Wishlist\Helper\Data')->isAllow()) : ?>
1919
<a href="#"
2020
class="action towishlist"
21-
title="<?php echo __('Add to Wishlist') ?>"
21+
title="<?php echo __('Add to Wish List') ?>"
2222
data-post='<?php echo $_wishlistSubmitParams; ?>'
23-
data-action="add-to-wishlist"><span><?php echo __('Add to Wishlist') ?></span></a>
23+
data-action="add-to-wishlist"><span><?php echo __('Add to Wish List') ?></span></a>
2424
<?php endif; ?>
2525
<a href="#" data-post='<?php echo $compareHelper->getPostDataParams($_product);?>'
2626
data-role="add-to-links"

‎app/code/Magento/Catalog/view/frontend/templates/product/widget/new/content/new_grid.phtml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,8 +100,8 @@ if ($exist = ($block->getProductCollection() && $block->getProductCollection()->
100100
<a href="#"
101101
data-post='<?php echo $block->getAddToWishlistParams($_item); ?>'
102102
class="action towishlist" data-action="add-to-wishlist"
103-
title="<?php echo __('Add to Wishlist') ?>">
104-
<span><?php echo __('Add to Wishlist') ?></span>
103+
title="<?php echo __('Add to Wish List') ?>">
104+
<span><?php echo __('Add to Wish List') ?></span>
105105
</a>
106106
<?php endif; ?>
107107
<?php if ($block->getAddToCompareUrl() && $showCompare): ?>

‎app/code/Magento/Catalog/view/frontend/templates/product/widget/new/content/new_list.phtml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,8 +99,8 @@ if ($exist = ($block->getProductCollection() && $block->getProductCollection()->
9999
<a href="#"
100100
data-post='<?php echo $block->getAddToWishlistParams($_item); ?>'
101101
class="action towishlist" data-action="add-to-wishlist"
102-
title="<?php echo __('Add to Wishlist') ?>">
103-
<span><?php echo __('Add to Wishlist') ?></span>
102+
title="<?php echo __('Add to Wish List') ?>">
103+
<span><?php echo __('Add to Wish List') ?></span>
104104
</a>
105105
<?php endif; ?>
106106
<?php if ($block->getAddToCompareUrl() && $showCompare): ?>

‎app/code/Magento/CatalogRule/Block/Adminhtml/Promo/Catalog/Edit/Tab/Main.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -194,8 +194,8 @@ protected function _prepareForm()
194194
'date',
195195
[
196196
'name' => 'from_date',
197-
'label' => __('From Date'),
198-
'title' => __('From Date'),
197+
'label' => __('From'),
198+
'title' => __('From'),
199199
'input_format' => \Magento\Framework\Stdlib\DateTime::DATE_INTERNAL_FORMAT,
200200
'date_format' => $dateFormat
201201
]
@@ -205,8 +205,8 @@ protected function _prepareForm()
205205
'date',
206206
[
207207
'name' => 'to_date',
208-
'label' => __('To Date'),
209-
'title' => __('To Date'),
208+
'label' => __('To'),
209+
'title' => __('To'),
210210
'input_format' => \Magento\Framework\Stdlib\DateTime::DATE_INTERNAL_FORMAT,
211211
'date_format' => $dateFormat
212212
]

‎app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog/Delete.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public function execute()
3030
$this->messageManager->addError($e->getMessage());
3131
} catch (\Exception $e) {
3232
$this->messageManager->addError(
33-
__('An error occurred while deleting the rule. Please review the log and try again.')
33+
__('We can\'t delete this rule right now. Please review the log and try again.')
3434
);
3535
$this->_objectManager->get('Psr\Log\LoggerInterface')->critical($e);
3636
$this->_redirect('catalog_rule/*/edit', ['id' => $this->getRequest()->getParam('id')]);

‎app/code/Magento/CatalogRule/Setup/InstallSchema.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,14 +56,14 @@ public function install(SchemaSetupInterface $setup, ModuleContextInterface $con
5656
\Magento\Framework\DB\Ddl\Table::TYPE_DATE,
5757
null,
5858
[],
59-
'From Date'
59+
'From'
6060
)
6161
->addColumn(
6262
'to_date',
6363
\Magento\Framework\DB\Ddl\Table::TYPE_DATE,
6464
null,
6565
[],
66-
'To Date'
66+
'To'
6767
)
6868
->addColumn(
6969
'is_active',

‎app/code/Magento/CatalogRule/view/adminhtml/layout/catalog_rule_promo_catalog_block.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
</block>
4444
<block class="Magento\Backend\Block\Widget\Grid\Column" as="from_date">
4545
<arguments>
46-
<argument name="header" xsi:type="string" translate="true">Start on</argument>
46+
<argument name="header" xsi:type="string" translate="true">Start</argument>
4747
<argument name="type" xsi:type="string">date</argument>
4848
<argument name="index" xsi:type="string">from_date</argument>
4949
<argument name="column_css_class" xsi:type="string">col-date</argument>
@@ -52,7 +52,7 @@
5252
</block>
5353
<block class="Magento\Backend\Block\Widget\Grid\Column" as="to_date">
5454
<arguments>
55-
<argument name="header" xsi:type="string" translate="true">End on</argument>
55+
<argument name="header" xsi:type="string" translate="true">End</argument>
5656
<argument name="type" xsi:type="string">date</argument>
5757
<argument name="default" xsi:type="string">--</argument>
5858
<argument name="index" xsi:type="string">to_date</argument>

‎app/code/Magento/CatalogSearch/view/frontend/layout/catalogsearch_result_index.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<block class="Magento\CatalogSearch\Block\Result" name="search.result" template="result.phtml" cacheable="false">
1313
<block class="Magento\CatalogSearch\Block\SearchResult\ListProduct" name="search_result_list" template="product/list.phtml" cacheable="false">
1414
<arguments>
15-
<!-- If position of argument is depend on image size changable in VDE:
15+
<!-- If argument's position depends on image size changeable in VDE:
1616
positions:list-secondary,grid-secondary,list-actions,grid-actions,list-primary,grid-primary
1717
-->
1818
<argument name="positioned" xsi:type="string">positions:list-secondary</argument>

‎app/code/Magento/CatalogWidget/view/frontend/templates/product/widget/content/grid.phtml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,8 +101,8 @@
101101
<a href="#"
102102
data-post='<?php echo $block->getAddToWishlistParams($_item); ?>'
103103
class="action towishlist" data-action="add-to-wishlist"
104-
title="<?php echo __('Add to Wishlist') ?>">
105-
<span><?php echo __('Add to Wishlist') ?></span>
104+
title="<?php echo __('Add to Wish List') ?>">
105+
<span><?php echo __('Add to Wish List') ?></span>
106106
</a>
107107
<?php endif; ?>
108108
<?php if ($block->getAddToCompareUrl() && $showCompare): ?>

‎app/code/Magento/Checkout/view/frontend/templates/cart/item/default.phtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ $canApplyMsrp = $helper->isShowBeforeOrderConfirm($product) && $helper->isMinima
124124
<a href="#"
125125
data-post='<?php echo $this->helper('Magento\Wishlist\Helper\Data')->getMoveFromCartParams($_item->getId()); ?>'
126126
class="use-ajax action towishlist">
127-
<span><?php echo __('Move to Wishlist'); ?></span>
127+
<span><?php echo __('Move to Wish List'); ?></span>
128128
</a>
129129
<?php endif ?>
130130
<?php endif ?>

‎app/code/Magento/Checkout/view/frontend/web/js/opc-checkout-method.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@ define([
183183
if (json.isGuestCheckoutAllowed) {
184184

185185
if( !guestChecked && !registerChecked ){
186-
alert( $.mage.__('Please choose to register or to checkout as a guest.') );
186+
alert( $.mage.__('You can create an account or check out as a guest.') );
187187

188188
return false;
189189
}

‎app/code/Magento/Checkout/view/frontend/web/js/opc-payment-info.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ define([
132132
return true;
133133
}
134134

135-
alert($.mage.__('Please specify payment method.'));
135+
alert($.mage.__('Please choose a payment method.'));
136136

137137
return false;
138138
},

0 commit comments

Comments
 (0)