Skip to content

Commit 8d9fdb7

Browse files
author
Hayder Sharhan
committed
Merge commit 'refs/pull/3633/head' of https://github.com/magento/magento2 into MAGETWO-54587-Public-PR-3633
# Conflicts: # app/code/Magento/Checkout/i18n/en_US.csv
2 parents 6474bc8 + c07ffa9 commit 8d9fdb7

File tree

2 files changed

+23
-0
lines changed

2 files changed

+23
-0
lines changed

app/code/Magento/Checkout/etc/acl.xml

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
<?xml version="1.0"?>
2+
<!--
3+
/**
4+
* Copyright © 2015 Magento. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Acl/etc/acl.xsd">
9+
<acl>
10+
<resources>
11+
<resource id="Magento_Backend::admin">
12+
<resource id="Magento_Backend::stores">
13+
<resource id="Magento_Backend::stores_settings">
14+
<resource id="Magento_Config::config">
15+
<resource id="Magento_Checkout::checkout" title="Checkout Section" translate="true" sortOrder="57" />
16+
</resource>
17+
</resource>
18+
</resource>
19+
</resource>
20+
</resources>
21+
</acl>
22+
</config>

app/code/Magento/Checkout/i18n/en_US.csv

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ State/Province,State/Province
2727
"One-page checkout is turned off.","One-page checkout is turned off."
2828
"Guest checkout is disabled.","Guest checkout is disabled."
2929
Checkout,Checkout
30+
"Checkout Section","Checkout Section"
3031
"Page not found.","Page not found."
3132
"Please agree to all the terms and conditions before placing the order.","Please agree to all the terms and conditions before placing the order."
3233
"Something went wrong while processing your order. Please try again later.","Something went wrong while processing your order. Please try again later."

0 commit comments

Comments
 (0)