Skip to content

Commit 68ffedf

Browse files
author
Momotenko,Natalia(nmomotenko)
committed
Merge pull request #272 from magento-webdev/PR-2
[WebDev] Bugfixes
2 parents 8ebcb63 + 60fb8b3 commit 68ffedf

File tree

77 files changed

+248
-146
lines changed

Some content is hidden

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

77 files changed

+248
-146
lines changed

‎app/code/Magento/Backend/Controller/Adminhtml/System/Store/DeleteGroupPost.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ public function execute()
4040
} catch (\Magento\Framework\Exception\LocalizedException $e) {
4141
$this->messageManager->addError($e->getMessage());
4242
} catch (\Exception $e) {
43-
$this->messageManager->addException($e, __('Unable to delete store. Please, try again later.'));
43+
$this->messageManager->addException($e, __('Unable to delete the store. Please try again later.'));
4444
}
4545
return $redirectResult->setPath('adminhtml/*/editGroup', ['group_id' => $itemId]);
4646
}

‎app/code/Magento/Backend/Controller/Adminhtml/System/Store/DeleteStorePost.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ public function execute()
4444
} catch (\Magento\Framework\Exception\LocalizedException $e) {
4545
$this->messageManager->addError($e->getMessage());
4646
} catch (\Exception $e) {
47-
$this->messageManager->addException($e, __('Unable to delete store view. Please, try again later.'));
47+
$this->messageManager->addException($e, __('Unable to delete the store view. Please try again later.'));
4848
}
4949
return $redirectResult->setPath('adminhtml/*/editStore', ['store_id' => $itemId]);
5050
}

‎app/code/Magento/Backend/Controller/Adminhtml/System/Store/DeleteWebsitePost.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ public function execute()
4242
} catch (\Magento\Framework\Exception\LocalizedException $e) {
4343
$this->messageManager->addError($e->getMessage());
4444
} catch (\Exception $e) {
45-
$this->messageManager->addException($e, __('Unable to delete website. Please, try again later.'));
45+
$this->messageManager->addException($e, __('Unable to delete the website. Please try again later.'));
4646
}
4747
return $redirectResult->setPath('*/*/editWebsite', ['website_id' => $itemId]);
4848
}

‎app/code/Magento/Backend/etc/adminhtml/system.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@
190190
<source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
191191
</field>
192192
<field id="enable_js_bundling" translate="label" type="select" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
193-
<label>Enable Javascript Bundling</label>
193+
<label>Enable JavaScript Bundling</label>
194194
<source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
195195
</field>
196196
<field id="minify_files" translate="label" type="select" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1">
@@ -215,7 +215,7 @@
215215
<label>Image Adapter</label>
216216
<source_model>Magento\Config\Model\Config\Source\Image\Adapter</source_model>
217217
<backend_model>Magento\Config\Model\Config\Backend\Image\Adapter</backend_model>
218-
<comment>When the adapter was changed, please, flush Catalog Images Cache.</comment>
218+
<comment>When the adapter was changed, please flush Catalog Images Cache.</comment>
219219
</field>
220220
</group>
221221
<group id="static" translate="label" type="text" sortOrder="130" showInDefault="1" showInWebsite="0" showInStore="0">

‎app/code/Magento/Backend/view/adminhtml/templates/system/cache/additional.phtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<button onclick="setLocation('<?php /* @escapeNotVerified */ echo $block->getCleanMediaUrl() ?>')" type="button">
2121
<?php /* @escapeNotVerified */ echo __('Flush JavaScript/CSS Cache') ?>
2222
</button>
23-
<span><?php /* @escapeNotVerified */ echo __('Themes JavaScript and CSS files combined to one file.') ?></span>
23+
<span><?php /* @escapeNotVerified */ echo __('Themes JavaScript and CSS files combined to one file') ?></span>
2424
</p>
2525
<?php
2626
if (!$block->isInProductionMode()):

‎app/code/Magento/Braintree/etc/adminhtml/system.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@
8181
<config_path>payment/braintree/debug</config_path>
8282
</field>
8383
<field id="capture_action" translate="label" type="select" sortOrder="60" showInDefault="1" showInWebsite="1" showInStore="0">
84-
<label>Capture action</label>
84+
<label>Capture Action</label>
8585
<source_model>Magento\Braintree\Model\Source\CaptureAction</source_model>
8686
<config_path>payment/braintree/capture_action</config_path>
8787
</field>

‎app/code/Magento/BraintreeTwo/Gateway/Validator/ResponseValidator.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ public function validate(array $validationSubject)
4343
$this->validateSuccess($response)
4444
&& $this->validateErrors($response)
4545
&& $this->validateTransactionStatus($response),
46-
[__('Transaction has been declined, please, try again later.')]
46+
[__('Transaction has been declined. Please try again later.')]
4747
);
4848

4949
return $result;

‎app/code/Magento/BraintreeTwo/Test/Unit/Gateway/Validator/ResponseValidatorTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ public function testValidate(array $validationSubject, $isValid)
110110
->method('create')
111111
->with([
112112
'isValid' => $isValid,
113-
'failsDescription' => ['Transaction has been declined, please, try again later.']
113+
'failsDescription' => ['Transaction has been declined. Please try again later.']
114114
])
115115
->willReturn($resultMock);
116116

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ protected function _prepareLayout()
3535
$accordion->addItem(
3636
'price',
3737
[
38-
'title' => __('We saved the price alert subscription.'),
38+
'title' => __('Price Alert Subscriptions'),
3939
'content' => $this->getLayout()->createBlock(
4040
'Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Alerts\Price'
4141
)->toHtml() . '<br />',
@@ -47,7 +47,7 @@ protected function _prepareLayout()
4747
$accordion->addItem(
4848
'stock',
4949
[
50-
'title' => __('We saved the stock notification.'),
50+
'title' => __('Stock Alert Subscriptions'),
5151
'content' => $this->getLayout()->createBlock(
5252
'Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Alerts\Stock'
5353
),

‎app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/tab/inventory.phtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ toggleValueElements($('inventory_use_config_max_sale_qty'), $('inventory_use_con
154154
<?php if (!$block->isVirtual()) : ?>
155155
<div class="field">
156156
<label class="label" for="inventory_is_decimal_divided">
157-
<span><?php /* @escapeNotVerified */ echo __('Allow Multiple Boxes for Shipping.') ?></span>
157+
<span><?php /* @escapeNotVerified */ echo __('Allow Multiple Boxes for Shipping') ?></span>
158158
</label>
159159
<div class="control">
160160
<select id="inventory_is_decimal_divided" name="<?php /* @escapeNotVerified */ echo $block->getFieldSuffix() ?>[stock_data][is_decimal_divided]" <?php /* @escapeNotVerified */ echo $_readonly;?>>

‎app/code/Magento/CatalogInventory/etc/adminhtml/system.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
<validate>validate-number</validate>
3333
</field>
3434
<field id="display_product_stock_status" translate="label" type="select" sortOrder="50" showInDefault="1" showInWebsite="1" showInStore="1">
35-
<label>Display products availability in stock on Storefront.</label>
35+
<label>Display Products Availability in Stock on Storefront</label>
3636
<source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
3737
</field>
3838
</group>

‎app/code/Magento/Checkout/Model/ShippingInformationManagement.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ public function saveAddressInformation(
148148
$this->totalsCollector->collectAddressTotals($quote, $address);
149149
} catch (\Exception $e) {
150150
$this->logger->critical($e);
151-
throw new InputException(__('Unable to save address. Please, check input data.'));
151+
throw new InputException(__('Unable to save address. Please check input data.'));
152152
}
153153

154154
if (!$address->getShippingRateByCode($address->getShippingMethod())) {
@@ -171,7 +171,7 @@ public function saveAddressInformation(
171171
$this->quoteRepository->save($quote);
172172
} catch (\Exception $e) {
173173
$this->logger->critical($e);
174-
throw new InputException(__('Unable to save shipping information. Please, check input data.'));
174+
throw new InputException(__('Unable to save shipping information. Please check input data.'));
175175
}
176176

177177
/** @var \Magento\Checkout\Api\Data\PaymentDetailsInterface $paymentDetails */

‎app/code/Magento/Checkout/Test/Unit/Model/ShippingInformationManagementTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -263,7 +263,7 @@ public function testSaveAddressInformationIfShippingAddressNotSet()
263263

264264
/**
265265
* @expectedException \Magento\Framework\Exception\InputException
266-
* @expectedExceptionMessage Unable to save address. Please, check input data.
266+
* @expectedExceptionMessage Unable to save address. Please check input data.
267267
*/
268268
public function testSaveAddressInformationThrowExceptionWhileAddressSaving()
269269
{
@@ -494,7 +494,7 @@ public function testSaveAddressInformationIfMinimumAmountIsNotValid()
494494

495495
/**
496496
* @expectedException \Magento\Framework\Exception\InputException
497-
* @expectedExceptionMessage Unable to save shipping information. Please, check input data.
497+
* @expectedExceptionMessage Unable to save shipping information. Please check input data.
498498
*/
499499
public function testSaveAddressInformationIfCanNotSaveQuote()
500500
{

‎app/code/Magento/Checkout/view/frontend/web/js/view/shipping.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -248,7 +248,7 @@ define(
248248
emailValidationResult = customer.isLoggedIn();
249249

250250
if (!quote.shippingMethod()) {
251-
this.errorValidationMessage('Please specify a shipping method');
251+
this.errorValidationMessage('Please specify a shipping method.');
252252

253253
return false;
254254
}

‎app/code/Magento/Checkout/view/frontend/web/template/authentication.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@
7979
</div>
8080
<div class="secondary">
8181
<a class="action action-remind" data-bind="attr: { href: forgotPasswordUrl }">
82-
<span data-bind="i18n: 'Forgot Password'"></span>
82+
<span data-bind="i18n: 'Forgot Your Password?'"></span>
8383
</a>
8484
</div>
8585
</div>

‎app/code/Magento/Checkout/view/frontend/web/template/registration.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<p data-bind="i18n: 'You can track your order status by creating an account.'"></p>
1010
<p><span data-bind="i18n: 'Email Address'"></span>: <span data-bind="text: getEmailAddress()"></span></p>
1111
<form method="post" data-bind="submit: createAccount">
12-
<input type="submit" class="action primary" data-bind="value: $t('Create Account'), disable: creationStarted" />
12+
<input type="submit" class="action primary" data-bind="value: $t('Create an Account'), disable: creationStarted" />
1313
</form>
1414
<!-- /ko -->
1515
<!-- ko if: accountCreated -->

‎app/code/Magento/Cms/Test/Unit/Helper/Wysiwyg/ImagesTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -370,7 +370,7 @@ public function testGetCurrentPathThrowException()
370370
$this->directoryWriteMock->expects($this->any())
371371
->method('create')
372372
->willThrowException(
373-
new \Magento\Framework\Exception\FileSystemException(__('Could not create directory.'))
373+
new \Magento\Framework\Exception\FileSystemException(__('Could not create a directory.'))
374374
);
375375

376376
$this->imagesHelper->getCurrentPath();

‎app/code/Magento/Cms/Ui/Component/Listing/Column/PageActions.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ public function prepareDataSource(array $dataSource)
8787
isset($item['_first_store_id']) ? $item['_first_store_id'] : null,
8888
isset($item['store_code']) ? $item['store_code'] : null
8989
),
90-
'label' => __('Preview')
90+
'label' => __('View')
9191
];
9292
}
9393
}

‎app/code/Magento/ConfigurableProduct/view/adminhtml/web/js/variations/steps/bulk.js

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -250,13 +250,15 @@ define([
250250
switch (section.type()) {
251251
case 'each':
252252
if (!section.attribute()) {
253-
throw new Error($.mage.__('Please, select attribute for the section ' + section.label));
253+
throw new Error($.mage.__('Please select attribute for {section} section.')
254+
.replace('{section}', section.label));
254255
}
255256
break;
256257

257258
case 'single':
258259
if (!section.value()) {
259-
throw new Error($.mage.__('Please fill in the values for the section ' + section.label));
260+
throw new Error($.mage.__('Please fill in the values for {section} section.')
261+
.replace('{section}', section.label));
260262
}
261263
break;
262264
}
@@ -267,22 +269,22 @@ define([
267269
});
268270

269271
if (!formValid) {
270-
throw new Error($.mage.__('Please, fill correct values'));
272+
throw new Error($.mage.__('Please fill-in correct values.'));
271273
}
272274
},
273275
validateImage: function () {
274276
switch (this.sections().images.type()) {
275277
case 'each':
276278
_.each(this.sections()['images'].attribute().chosen, function (option) {
277279
if (!option.sections().images.images.length) {
278-
throw new Error($.mage.__('Please, select image(s) for your attribute'));
280+
throw new Error($.mage.__('Please select image(s) for your attribute.'));
279281
}
280282
});
281283
break;
282284

283285
case 'single':
284286
if (this.sections().images.value().file == null) {
285-
throw new Error($.mage.__('Please choose image(s)'));
287+
throw new Error($.mage.__('Please choose image(s).'));
286288
}
287289
break;
288290
}

‎app/code/Magento/ConfigurableProduct/view/adminhtml/web/js/variations/steps/select_attributes.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ define([
5353
setNotificationMessage: function () {
5454
if (this.mode === 'edit') {
5555
this.wizard.setNotificationMessage($.mage.__('When you remove or add an attribute, we automatically ' +
56-
'update all configurations and you will need to manually recreate the current configurations.'));
56+
'update all configurations and you will need to recreate current configurations manually.'));
5757
}
5858
},
5959
doSelectSavedAttributes: function () {
@@ -90,7 +90,7 @@ define([
9090
wizard.data.attributesIds = this.multiselect().selected;
9191

9292
if (!wizard.data.attributesIds() || wizard.data.attributesIds().length === 0) {
93-
throw new Error($.mage.__('Please, select attribute(s)'));
93+
throw new Error($.mage.__('Please select attribute(s).'));
9494
}
9595
this.setNotificationMessage();
9696
},

‎app/code/Magento/CurrencySymbol/Controller/Adminhtml/System/Currency/SaveRates.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ public function execute()
2727
$data[$currencyCode][$currencyTo] = $value;
2828
if ($value == 0) {
2929
$this->messageManager->addWarning(
30-
__('Please correct the input data for %1 => %2 rate', $currencyCode, $currencyTo)
30+
__('Please correct the input data for "%1 => %2" rate.', $currencyCode, $currencyTo)
3131
);
3232
}
3333
}

‎app/code/Magento/Customer/Block/Adminhtml/Group/Edit/Form.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ protected function _prepareLayout()
9595
'label' => __('Group Name'),
9696
'title' => __('Group Name'),
9797
'note' => __(
98-
'Maximum length must be less then %1 symbols',
98+
'Maximum length must be less then %1 characters.',
9999
\Magento\Customer\Model\GroupManagement::GROUP_CODE_MAX_LENGTH
100100
),
101101
'class' => $validateClass,

‎app/code/Magento/Customer/Setup/CustomerSetup.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,7 @@ public function getDefaultEntities()
229229
],
230230
'dob' => [
231231
'type' => 'static',
232-
'label' => 'Date Of Birth',
232+
'label' => 'Date of Birth',
233233
'input' => 'date',
234234
'frontend' => 'Magento\Eav\Model\Entity\Attribute\Frontend\Datetime',
235235
'backend' => 'Magento\Eav\Model\Entity\Attribute\Backend\Datetime',

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ public function install(SchemaSetupInterface $setup, ModuleContextInterface $con
130130
\Magento\Framework\DB\Ddl\Table::TYPE_DATE,
131131
null,
132132
[],
133-
'Date Of Birth'
133+
'Date of Birth'
134134
)->addColumn(
135135
'password_hash',
136136
\Magento\Framework\DB\Ddl\Table::TYPE_TEXT,

‎app/code/Magento/Customer/view/frontend/layout/customer_account_logoutsuccess.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<body>
1010
<referenceBlock name="page.main.title">
1111
<action method="setPageTitle">
12-
<argument name="title" translate="true" xsi:type="string">You are signed out.</argument>
12+
<argument name="title" translate="true" xsi:type="string">You are signed out</argument>
1313
</action>
1414
</referenceBlock>
1515
<referenceContainer name="content">

‎app/code/Magento/Customer/view/frontend/templates/address/edit.phtml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@
100100
</div>
101101

102102
<?php if ($block->isDefaultBilling()): ?>
103-
<div class="field note default"><?php /* @escapeNotVerified */ echo __('Default Billing Address') ?></div>
103+
<div class="message info"><?php /* @escapeNotVerified */ echo __("It's a default billing address.") ?></div>
104104
<?php elseif ($block->canSetAsDefaultBilling()): ?>
105105
<div class="field choice set billing">
106106
<input type="checkbox" id="primary_billing" name="default_billing" value="1" class="checkbox">
@@ -111,7 +111,7 @@
111111
<?php endif; ?>
112112

113113
<?php if ($block->isDefaultShipping()): ?>
114-
<div class="field note default"><?php /* @escapeNotVerified */ echo __('Default Shipping Address') ?></div>
114+
<div class="message info"><?php /* @escapeNotVerified */ echo __("It's a default shipping address.") ?></div>
115115
<?php elseif ($block->canSetAsDefaultShipping()): ?>
116116
<div class="field choice set shipping">
117117
<input type="checkbox" id="primary_shipping" name="default_shipping" value="1" class="checkbox">

‎app/code/Magento/Customer/view/frontend/templates/form/forgotpassword.phtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
</fieldset>
2727
<div class="actions-toolbar">
2828
<div class="primary">
29-
<button type="submit" class="action submit primary"><span><?php /* @escapeNotVerified */ echo __('Submit') ?></span></button>
29+
<button type="submit" class="action submit primary"><span><?php /* @escapeNotVerified */ echo __('Reset My Password') ?></span></button>
3030
</div>
3131
<div class="secondary">
3232
<a class="action back" href="<?php /* @escapeNotVerified */ echo $block->getLoginUrl() ?>"><span><?php /* @escapeNotVerified */ echo __('Go back') ?></span></a>

‎app/code/Magento/Customer/view/frontend/templates/form/login.phtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
</div>
4444
<?php echo $block->getChildHtml('form_additional_info'); ?>
4545
<div class="actions-toolbar">
46-
<div class="primary"><button type="submit" class="action login primary" name="send" id="send2"><span><?php /* @escapeNotVerified */ echo __('Login') ?></span></button></div>
46+
<div class="primary"><button type="submit" class="action login primary" name="send" id="send2"><span><?php /* @escapeNotVerified */ echo __('Sign In') ?></span></button></div>
4747
<div class="secondary"><a class="action remind" href="<?php /* @escapeNotVerified */ echo $block->getForgotPasswordUrl() ?>"><span><?php /* @escapeNotVerified */ echo __('Forgot Your Password?') ?></span></a></div>
4848
</div>
4949
</fieldset>

‎app/code/Magento/Customer/view/frontend/web/template/authentication-popup.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
<div class="actions-toolbar">
2727
<div class="primary">
2828
<a class="action action-register primary" data-bind="attr: {href: registerUrl}">
29-
<span data-bind="i18n: 'Create Account'"></span>
29+
<span data-bind="i18n: 'Create an Account'"></span>
3030
</a>
3131
</div>
3232
</div>

0 commit comments

Comments
 (0)