Skip to content

Commit 6db65b0

Browse files
author
Stanislav Idolov
authored
🔃 [EngCom] Public Pull Requests - 2.1-develop
Accepted Public Pull Requests: - #15927: [Backport] [#14089] Add Malaysian Locale Code (by @dmytro-ch) - #15926: [Backport] precision for price overriding by js (by @dmytro-ch) - #15925: [Backport] Format code (by @dmytro-ch) - #15924: [Backport] Added spanish Bolivia locale to allowedLocales list (by @dmytro-ch) - #15920: [Backport] chore: remove unused less import (by @DanielRuf) - #15887: [Backport-2.1] Added language translation in template files (by @rahul-kachhadiya) - #15866: [Backport] Update webapi.xml to fix typo (by @dmytro-ch) - #15290: [Backport] Fix typo in database column comment (by @VitaliyBoyko) Fixed GitHub Issues: - #14089: Malaysian (Malaysia) missing from locale list (reported by @superdav42) has been fixed in #15927 by @dmytro-ch in 2.1-develop branch Related commits: 1. 0658873 - #14249: Priduct page price is using the hardcoded digits in js (reported by @cdiacon) has been fixed in #15926 by @dmytro-ch in 2.1-develop branch Related commits: 1. 6257807
2 parents c07e5bb + 18ca396 commit 6db65b0

File tree

10 files changed

+11
-8
lines changed

10 files changed

+11
-8
lines changed

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,4 +165,5 @@ Debug,Debug
165165
"credit_card","Credit card"
166166
"apple_pay_card","Apple pay card"
167167
"android_pay_card","Android pay card"
168-
"Accept credit/debit cards and PayPal in your Magento store.<br/>No setup or monthly fees and your customers never leave your store to complete the purchase.","Accept credit/debit cards and PayPal in your Magento store.<br/>No setup or monthly fees and your customers never leave your store to complete the purchase."
168+
"Accept credit/debit cards and PayPal in your Magento store.<br/>No setup or monthly fees and your customers never leave your store to complete the purchase.","Accept credit/debit cards and PayPal in your Magento store.<br/>No setup or monthly fees and your customers never leave your store to complete the purchase."
169+
"Save for later use.","Save for later use."

app/code/Magento/Braintree/view/adminhtml/templates/form/cc.phtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ $ccType = $block->getInfoData('cc_type');
8484
name="payment[is_active_payment_token_enabler]"
8585
class="admin__control-checkbox"/>
8686
<label class="label" for="<?php /* @noEscape */ echo $code; ?>_vault">
87-
<span><?php echo $block->escapeHtml('Save for later use.'); ?></span>
87+
<span><?php echo $block->escapeHtml(__('Save for later use.')); ?></span>
8888
</label>
8989
</div>
9090
<?php endif; ?>

app/code/Magento/Catalog/Setup/InstallSchema.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -674,7 +674,7 @@ public function install(SchemaSetupInterface $setup, ModuleContextInterface $con
674674
\Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
675675
null,
676676
['unsigned' => true, 'nullable' => false, 'default' => '0'],
677-
'Attriute Set ID'
677+
'Attribute Set ID'
678678
)
679679
->addColumn(
680680
'parent_id',

app/code/Magento/Catalog/view/base/web/js/price-utils.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ define([
7070
am = Number(Math.round(Math.abs(amount - i) + 'e+' + precision) + ('e-' + precision));
7171
r = (j ? i.substr(0, j) + groupSymbol : '') +
7272
i.substr(j).replace(re, '$1' + groupSymbol) +
73-
(precision ? decimalSymbol + am.toFixed(2).replace(/-/, 0).slice(2) : '');
73+
(precision ? decimalSymbol + am.toFixed(precision).replace(/-/, 0).slice(2) : '');
7474

7575
return pattern.replace('%s', r).replace(/^\s\s*/, '').replace(/\s\s*$/, '');
7676
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@
104104
<resource ref="anonymous" />
105105
</resources>
106106
</route>
107-
<!-- Managing My shipping information -->
107+
<!-- Managing My payment information -->
108108
<route url="/V1/carts/mine/set-payment-information" method="POST">
109109
<service class="Magento\Checkout\Api\PaymentInformationManagementInterface" method="savePaymentInformation"/>
110110
<resources>

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -680,3 +680,4 @@ User,User
680680
"payflowpro","Payflow Pro"
681681
"Payments Pro","Payments Pro"
682682
"Website Payments Pro","Website Payments Pro"
683+
"Save for later use.","Save for later use."

app/code/Magento/Paypal/view/adminhtml/templates/transparent/form.phtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ $ccExpMonth = $block->getInfoData('cc_exp_month');
135135
name="payment[is_active_payment_token_enabler]"
136136
class="admin__control-checkbox"/>
137137
<label class="label" for="<?php /* @noEscape */ echo $code; ?>_vault">
138-
<span><?php echo $block->escapeHtml('Save for later use.'); ?></span>
138+
<span><?php echo $block->escapeHtml(__('Save for later use.')); ?></span>
139139
</label>
140140
</div>
141141
<?php endif; ?>

app/code/Magento/Review/etc/adminhtml/menu.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<menu>
1010
<add id="Magento_Review::catalog_reviews_ratings_ratings" title="Rating" translate="title" module="Magento_Review" sortOrder="60" parent="Magento_Backend::stores_attributes" action="review/rating/" resource="Magento_Review::ratings"/>
1111
<add id="Magento_Review::catalog_reviews_ratings_reviews_all" title="Reviews" translate="title" module="Magento_Review" parent="Magento_Backend::marketing_user_content" sortOrder="10" action="review/product/index" resource="Magento_Review::reviews_all"/>
12-
<add id="Magento_Review::report_review" title="Reviews" translate="title" module="Magento_Reports" sortOrder="20" parent="Magento_Reports::report" resource="Magento_Reports::review"/>
12+
<add id="Magento_Review::report_review" title="Reviews" translate="title" module="Magento_Reports" sortOrder="20" parent="Magento_Reports::report" resource="Magento_Reports::review"/>
1313
<add id="Magento_Review::report_review_customer" title="By Customers" translate="title" sortOrder="10" module="Magento_Review" parent="Magento_Review::report_review" action="reports/report_review/customer" resource="Magento_Reports::review_customer"/>
1414
<add id="Magento_Review::report_review_product" title="By Products" translate="title" sortOrder="20" module="Magento_Review" parent="Magento_Review::report_review" action="reports/report_review/product" resource="Magento_Reports::review_product"/>
1515
</menu>

lib/internal/Magento/Framework/Locale/Config.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@ class Config implements \Magento\Framework\Locale\ConfigInterface
7272
'mk_MK', /*Macedonian (Macedonia)*/
7373
'mn_Cyrl_MN', /*Mongolian (Mongolia)*/
7474
'ms_Latn_MY', /*Malaysian (Malaysia)*/
75+
'ms_MY', /*Malaysian (Malaysia)*/
7576
'nl_BE', /*Dutch (Belgium)*/
7677
'nl_NL', /*Dutch (Netherlands)*/
7778
'nb_NO', /*Norwegian BokmГ_l (Norway)*/
@@ -98,6 +99,7 @@ class Config implements \Magento\Framework\Locale\ConfigInterface
9899
'lo_LA', /*Laotian*/
99100
'es_VE', /*Spanish (Venezuela)*/
100101
'en_IE', /*English (Ireland)*/
102+
'es_BO', /*Spanish (Bolivia)*/
101103
];
102104

103105
/**

lib/web/css/docs/source/docs.less

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
@import '_icons.less';
2222
@import '_loaders.less';
2323
@import '_messages.less';
24-
//@import 'navigation.less';
2524
@import '_layout.less';
2625
@import '_pages.less';
2726
@import '_popups.less';

0 commit comments

Comments
 (0)