Skip to content

Commit cc880d9

Browse files
Indrani SonawaneIndrani Sonawane
authored andcommitted
Merge remote-tracking branch '36943/translatable-string-address-renderers' into compr248beta1
2 parents e9830bf + 24861ea commit cc880d9

File tree

6 files changed

+10
-6
lines changed

6 files changed

+10
-6
lines changed

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -192,3 +192,4 @@ Are you sure you want to leave the page?,Are you sure you want to leave the page
192192
Changes you made to the cart will not be saved.,Changes you made to the cart will not be saved.
193193
Leave,Leave
194194
Cancel,Cancel
195+
VAT,VAT

app/code/Magento/Checkout/view/frontend/web/template/billing-address/details.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<text args="getCountryName(currentBillingAddress().countryId)"></text><br>
1818
<a if="currentBillingAddress().telephone" attr="'href': 'tel:' + currentBillingAddress().telephone" text="currentBillingAddress().telephone"></a><br>
1919
<if args="currentBillingAddress().vatId">
20-
VAT: <text args="currentBillingAddress().vatId"></text><br>
20+
<translate args="'VAT'"></translate>: <text args="currentBillingAddress().vatId"></text><br>
2121
</if>
2222
<each args="data: currentBillingAddress().customAttributes, as: 'element'">
2323
<text args="$parent.getCustomAttributeLabel(element)"></text>

app/code/Magento/Checkout/view/frontend/web/template/shipping-address/address-renderer/default.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<text args="getCountryName(address().countryId)"></text><br>
1616
<a if="address().telephone" attr="'href': 'tel:' + address().telephone" text="address().telephone"></a><br>
1717
<if args="address().vatId">
18-
VAT: <text args="address().vatId"></text><br>
18+
<translate args="'VAT'"></translate>: <text args="address().vatId"></text><br>
1919
</if>
2020
<each args="data: address().customAttributes, as: 'element'">
2121
<text args="$parent.getCustomAttributeLabel(element)"></text>

app/code/Magento/Checkout/view/frontend/web/template/shipping-information/address-renderer/default.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<text args="getCountryName(address().countryId)"></text><br>
1616
<a if="address().telephone" attr="'href': 'tel:' + address().telephone" text="address().telephone"></a><br>
1717
<if args="address().vatId">
18-
VAT: <text args="address().vatId"></text><br>
18+
<translate args="'VAT'"></translate>: <text args="address().vatId"></text><br>
1919
</if>
2020
<each args="data: address().customAttributes, as: 'element'">
2121
<text args="$parent.getCustomAttributeLabel(element)"></text>

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -546,3 +546,6 @@ Addresses,Addresses
546546
"Partial Match","Partial Match"
547547
"Full Match","Full Match"
548548
"Prefix Match","Prefix Match"
549+
T,T
550+
F,F
551+
VAT,VAT

app/code/Magento/Customer/view/adminhtml/web/template/default-address.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,13 +38,13 @@
3838
</if>
3939
<text args="address.country"></text>
4040
<if args="address.telephone">
41-
<br>T: <a attr="href: 'tel:' + address.telephone" text="address.telephone"></a>
41+
<br><translate args="'T'"></translate>: <a attr="href: 'tel:' + address.telephone" text="address.telephone"></a>
4242
</if>
4343
<if args="address.fax">
44-
<br>F: <text args="address.fax"></text>
44+
<br><translate args="'F'"></translate>: <text args="address.fax"></text>
4545
</if>
4646
<if args="address.vat_id">
47-
<br>VAT: <text args="address.vat_id"></text>
47+
<br><translate args="'VAT'"></translate>: <text args="address.vat_id"></text>
4848
</if>
4949
</div>
5050
<translate args="notExistsMessage" if="_.isEmpty($data.address)"></translate>

0 commit comments

Comments
 (0)