Skip to content

Commit 7c72e09

Browse files
author
Natalia Momotenko
committed
Merge remote-tracking branch 'origin/MAGETWO-46821_2' into PR-2
2 parents 4cd6e3c + 8ad979e commit 7c72e09

File tree

65 files changed

+89
-85
lines changed

Some content is hidden

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

65 files changed

+89
-85
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
@@ -25,7 +25,7 @@ public function validate(array $validationSubject)
2525
$this->validateSuccess($response)
2626
&& $this->validateErrors($response)
2727
&& $this->validateTransactionStatus($response),
28-
[__('Transaction has been declined, please, try again later.')]
28+
[__('Transaction has been declined. Please try again later.')]
2929
);
3030

3131
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
@@ -85,7 +85,7 @@ public function testValidate(array $validationSubject, $isValid)
8585
->method('create')
8686
->with([
8787
'isValid' => $isValid,
88-
'failsDescription' => ['Transaction has been declined, please, try again later.']
88+
'failsDescription' => ['Transaction has been declined. Please try again later.']
8989
])
9090
->willReturn($resultMock);
9191

‎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;?>>

0 commit comments

Comments
 (0)