Skip to content

Commit 8647888

Browse files
zakdmazakdma
committed
Merge remote-tracking branch 'origin/MC-31663' into 2.4-develop-pr32
2 parents 90334f8 + f0388fd commit 8647888

File tree

6 files changed

+379
-268
lines changed

6 files changed

+379
-268
lines changed

‎app/code/Magento/Translation/Model/ResourceModel/StringUtils.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -270,7 +270,7 @@ public function saveTranslate($string, $translate, $locale = null, $storeId = nu
270270
];
271271

272272
if ($row = $connection->fetchRow($select, $bind)) {
273-
$original = $string;
273+
$original = $this->escaper->escapeHtml($string);
274274
if (strpos($original, '::') !== false) {
275275
list(, $original) = explode('::', $original);
276276
}

‎app/code/Magento/Translation/Model/ResourceModel/Translate.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,9 @@ public function getTranslationArray($storeId = null, $locale = null)
102102
->where('locale = :locale')
103103
->order('store_id');
104104
$bind = [':locale' => $locale, ':store_id' => $storeId];
105-
$dbData = $connection->fetchPairs($select, $bind);
105+
$dbData = array_map(function ($value) {
106+
return htmlspecialchars_decode($value);
107+
}, $connection->fetchPairs($select, $bind));
106108
$data = array_replace($data, $dbData);
107109
}
108110
return $data;

‎app/code/Magento/Translation/Test/Mftf/Data/TranslationData.xml

Lines changed: 174 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,174 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
9+
<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
11+
<entity name="CustomTranslationData" type="translation_operation">
12+
<var key="customer_email" entityType="customer" entityKey="email"/>
13+
<var key="customer_password" entityType="customer" entityKey="password"/>
14+
</entity>
15+
<entity name="RevertProceedToCheckoutTranslate" extends="CustomTranslationData">
16+
<requiredEntity type="translation_operation_translate">RevertProceedToCheckoutTranslateData</requiredEntity>
17+
</entity>
18+
<entity name="RevertProceedToCheckoutTranslateData" type="translation_operation_translate">
19+
<data key="original">Proceed to Checkout</data>
20+
<data key="custom">Proceed to Checkout</data>
21+
</entity>
22+
23+
<entity name="RevertViewAndEditCartTranslate" extends="CustomTranslationData">
24+
<requiredEntity type="translation_operation_translate">RevertViewAndEditCartTranslateData</requiredEntity>
25+
</entity>
26+
<entity name="RevertViewAndEditCartTranslateData" type="translation_operation_translate">
27+
<data key="original">View and Edit Cart</data>
28+
<data key="custom">View and Edit Cart</data>
29+
</entity>
30+
31+
<entity name="RevertQtyTranslate" extends="CustomTranslationData">
32+
<requiredEntity type="translation_operation_translate">RevertQtyTranslateData</requiredEntity>
33+
</entity>
34+
<entity name="RevertQtyTranslateData" type="translation_operation_translate">
35+
<data key="original">Qty</data>
36+
<data key="custom">Qty</data>
37+
</entity>
38+
39+
<entity name="RevertShippingAddressTitleTranslate" extends="CustomTranslationData">
40+
<requiredEntity type="translation_operation_translate">RevertShippingAddressTitleTranslateData</requiredEntity>
41+
</entity>
42+
<entity name="RevertShippingAddressTitleTranslateData" type="translation_operation_translate">
43+
<data key="original">Shipping Address</data>
44+
<data key="custom">Shipping Address</data>
45+
</entity>
46+
47+
<entity name="RevertButtonShipHereTranslate" extends="CustomTranslationData">
48+
<requiredEntity type="translation_operation_translate">RevertButtonShipHereTranslateData</requiredEntity>
49+
</entity>
50+
<entity name="RevertButtonShipHereTranslateData" type="translation_operation_translate">
51+
<data key="original">Ship Here</data>
52+
<data key="custom">Ship Here</data>
53+
</entity>
54+
55+
<entity name="RevertButtonNewAddressTranslate" extends="CustomTranslationData">
56+
<requiredEntity type="translation_operation_translate">RevertButtonNewAddressTranslateData</requiredEntity>
57+
</entity>
58+
<entity name="RevertButtonNewAddressTranslateData" type="translation_operation_translate">
59+
<data key="original">New Address</data>
60+
<data key="custom">New Address</data>
61+
</entity>
62+
63+
<entity name="RevertShippingMethodTitleTranslate" extends="CustomTranslationData">
64+
<requiredEntity type="translation_operation_translate">RevertShippingMethodTitleTranslateData</requiredEntity>
65+
</entity>
66+
<entity name="RevertShippingMethodTitleTranslateData" type="translation_operation_translate">
67+
<data key="original">Shipping Methods</data>
68+
<data key="custom">Shipping Methods</data>
69+
</entity>
70+
71+
<entity name="RevertButtonNextTranslate" extends="CustomTranslationData">
72+
<requiredEntity type="translation_operation_translate">RevertButtonNextTranslateData</requiredEntity>
73+
</entity>
74+
<entity name="RevertButtonNextTranslateData" type="translation_operation_translate">
75+
<data key="original">Next</data>
76+
<data key="custom">Next</data>
77+
</entity>
78+
79+
<entity name="RevertOrderSummaryTitleTranslate" extends="CustomTranslationData">
80+
<requiredEntity type="translation_operation_translate">RevertOrderSummaryTitleTranslateData</requiredEntity>
81+
</entity>
82+
<entity name="RevertOrderSummaryTitleTranslateData" type="translation_operation_translate">
83+
<data key="original">Order Summary</data>
84+
<data key="custom">Order Summary</data>
85+
</entity>
86+
87+
<entity name="RevertItemsInCartTextTranslate" extends="CustomTranslationData">
88+
<requiredEntity type="translation_operation_translate">RevertItemsInCartTextTranslateData</requiredEntity>
89+
</entity>
90+
<entity name="RevertItemsInCartTextTranslateData" type="translation_operation_translate">
91+
<data key="original">Item in Cart</data>
92+
<data key="custom">Item in Cart</data>
93+
</entity>
94+
95+
<entity name="RevertProgressBarReviewAndPaymentsTranslate" extends="CustomTranslationData">
96+
<requiredEntity type="translation_operation_translate">RevertProgressBarReviewAndPaymentsTranslateData</requiredEntity>
97+
</entity>
98+
<entity name="RevertProgressBarReviewAndPaymentsTranslateData" type="translation_operation_translate">
99+
<data key="original">Review &amp; Payments</data>
100+
<data key="custom">Review &amp; Payments</data>
101+
</entity>
102+
103+
<entity name="RevertPaymentTitleTranslate" extends="CustomTranslationData">
104+
<requiredEntity type="translation_operation_translate">RevertPaymentTitleTranslateData</requiredEntity>
105+
</entity>
106+
<entity name="RevertPaymentTitleTranslateData" type="translation_operation_translate">
107+
<data key="original">Payment Method</data>
108+
<data key="custom">Payment Method</data>
109+
</entity>
110+
111+
<entity name="RevertCheckboxSameBillingAddressTranslate" extends="CustomTranslationData">
112+
<requiredEntity type="translation_operation_translate">RevertCheckboxSameBillingAddressTranslateData</requiredEntity>
113+
</entity>
114+
<entity name="RevertCheckboxSameBillingAddressTranslateData" type="translation_operation_translate">
115+
<data key="original">My billing and shipping address are the same</data>
116+
<data key="custom">My billing and shipping address are the same</data>
117+
</entity>
118+
119+
<entity name="RevertPlaceOrderButtonTranslate" extends="CustomTranslationData">
120+
<requiredEntity type="translation_operation_translate">RevertPlaceOrderButtonTranslateData</requiredEntity>
121+
</entity>
122+
<entity name="RevertPlaceOrderButtonTranslateData" type="translation_operation_translate">
123+
<data key="original">Place Order</data>
124+
<data key="custom">Place Order</data>
125+
</entity>
126+
127+
<entity name="RevertApplyDiscountCodeTranslate" extends="CustomTranslationData">
128+
<requiredEntity type="translation_operation_translate">RevertApplyDiscountCodeTranslateData</requiredEntity>
129+
</entity>
130+
<entity name="RevertApplyDiscountCodeTranslateData" type="translation_operation_translate">
131+
<data key="original">Apply Discount Code</data>
132+
<data key="custom">Apply Discount Code</data>
133+
</entity>
134+
135+
<entity name="RevertCartSubtotalTextTranslate" extends="CustomTranslationData">
136+
<requiredEntity type="translation_operation_translate">RevertCartSubtotalTextTranslateData</requiredEntity>
137+
</entity>
138+
<entity name="RevertCartSubtotalTextTranslateData" type="translation_operation_translate">
139+
<data key="original">Cart Subtotal</data>
140+
<data key="custom">Cart Subtotal</data>
141+
</entity>
142+
143+
<entity name="RevertShippingTextTranslate" extends="CustomTranslationData">
144+
<requiredEntity type="translation_operation_translate">RevertShippingTextTranslateData</requiredEntity>
145+
</entity>
146+
<entity name="RevertShippingTextTranslateData" type="translation_operation_translate">
147+
<data key="original">Shipping</data>
148+
<data key="custom">Shipping</data>
149+
</entity>
150+
151+
<entity name="RevertOrderTotalTextTranslate" extends="CustomTranslationData">
152+
<requiredEntity type="translation_operation_translate">RevertOrderTotalTextTranslateData</requiredEntity>
153+
</entity>
154+
<entity name="RevertOrderTotalTextTranslateData" type="translation_operation_translate">
155+
<data key="original">Order Total</data>
156+
<data key="custom">Order Total</data>
157+
</entity>
158+
159+
<entity name="RevertShipToTitleTranslate" extends="CustomTranslationData">
160+
<requiredEntity type="translation_operation_translate">RevertShipToTitleTranslateData</requiredEntity>
161+
</entity>
162+
<entity name="RevertShipToTitleTranslateData" type="translation_operation_translate">
163+
<data key="original">Ship To:</data>
164+
<data key="custom">Ship To:</data>
165+
</entity>
166+
167+
<entity name="RevertShipViaTitleTranslate" extends="CustomTranslationData">
168+
<requiredEntity type="translation_operation_translate">RevertShipViaTitleTranslateData</requiredEntity>
169+
</entity>
170+
<entity name="RevertShipViaTitleTranslateData" type="translation_operation_translate">
171+
<data key="original">Shipping Method:</data>
172+
<data key="custom">Shipping Method:</data>
173+
</entity>
174+
</entities>

‎app/code/Magento/Translation/Test/Mftf/Metadata/TranslationMeta.xml

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
<operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataOperation.xsd">
9+
<operation name="Translation" dataType="translation_operation" type="create" url="/translation/ajax/index" method="POST" auth="customerFormKey">
10+
<field key="customer_email">string</field>
11+
<field key="customer_password">string</field>
12+
<object key="translate" dataType="translation_operation">
13+
<object key="0" dataType="translation_operation_translate">
14+
<field key="original">string</field>
15+
<field key="custom">string</field>
16+
</object>
17+
</object>
18+
</operation>
19+
</operations>

0 commit comments

Comments
 (0)