Skip to content

Commit 953f5e5

Browse files
author
Cari Spruiell
committed
MAGETWO-44459: Check javascript function calls and labels are translatable
- added missing translation phrases to i18n files - added translate attribute to xml template files - modified layout & attribute processors to translate fields whose values are loaded from attribute sets in the database
1 parent 5d9f8b3 commit 953f5e5

File tree

85 files changed

+228
-925
lines changed

Some content is hidden

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

85 files changed

+228
-925
lines changed

app/code/Magento/Backend/Block/Widget/Form.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ protected function _setFieldset($attributes, $fieldset, $exclude = [])
187187
$fieldType,
188188
[
189189
'name' => $attribute->getAttributeCode(),
190-
'label' => $attribute->getFrontend()->getLabel(),
190+
'label' => __($attribute->getFrontend()->getLabel()),
191191
'class' => $attribute->getFrontend()->getClass(),
192192
'required' => $attribute->getIsRequired(),
193193
'note' => $attribute->getNote()

app/code/Magento/Backend/i18n/de_DE.csv

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -606,3 +606,4 @@ Tags,Tags
606606
Options,Options
607607
"Magento Admin","Magento Admin"
608608
"Community Edition","Community Edition"
609+
"VAT number","VAT number"

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -606,3 +606,4 @@ Tags,Tags
606606
Options,Options
607607
"Magento Admin","Magento Admin"
608608
"Community Edition","Community Edition"
609+
"VAT number","VAT number"

app/code/Magento/Backend/i18n/es_ES.csv

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -606,3 +606,4 @@ Tags,Tags
606606
Options,Options
607607
"Magento Admin","Magento Admin"
608608
"Community Edition","Community Edition"
609+
"VAT number","VAT number"

app/code/Magento/Backend/i18n/fr_FR.csv

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -606,3 +606,4 @@ Tags,Tags
606606
Options,Options
607607
"Magento Admin","Magento Admin"
608608
"Community Edition","Community Edition"
609+
"VAT number","VAT number"

app/code/Magento/Backend/i18n/nl_NL.csv

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -606,3 +606,4 @@ Tags,Tags
606606
Options,Options
607607
"Magento Admin","Magento Admin"
608608
"Community Edition","Community Edition"
609+
"VAT number","VAT number"

app/code/Magento/Backend/i18n/pt_BR.csv

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -606,3 +606,4 @@ Tags,Tags
606606
Options,Options
607607
"Magento Admin","Magento Admin"
608608
"Community Edition","Community Edition"
609+
"VAT number","VAT number"

app/code/Magento/Backend/i18n/zh_Hans_CN.csv

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -606,3 +606,4 @@ Tags,Tags
606606
Options,Options
607607
"Magento Admin","Magento Admin"
608608
"Community Edition","Community Edition"
609+
"VAT number","VAT number"

app/code/Magento/Catalog/Block/Product/View/Attributes.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ public function getAdditionalData(array $excludeAttr = [])
8888

8989
if (is_string($value) && strlen($value)) {
9090
$data[$attribute->getAttributeCode()] = [
91-
'label' => $attribute->getStoreLabel(),
91+
'label' => __($attribute->getStoreLabel()),
9292
'value' => $value,
9393
'code' => $attribute->getAttributeCode(),
9494
];

app/code/Magento/Catalog/etc/adminhtml/di.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,19 +16,19 @@
1616
<arguments>
1717
<argument name="imageTypes" xsi:type="array">
1818
<item name="small" xsi:type="array">
19-
<item name="title" xsi:type="string">Small</item>
19+
<item name="title" xsi:type="string" translate="true">Small</item>
2020
<item name="attribute" xsi:type="string">small_image</item>
2121
</item>
2222
<item name="main" xsi:type="array">
23-
<item name="title" xsi:type="string">Main</item>
23+
<item name="title" xsi:type="string" translate="true">Main</item>
2424
<item name="attribute" xsi:type="string">image</item>
2525
</item>
2626
<item name="cart" xsi:type="array">
27-
<item name="title" xsi:type="string">Thumbnail</item>
27+
<item name="title" xsi:type="string" translate="true">Thumbnail</item>
2828
<item name="attribute" xsi:type="string">thumbnail</item>
2929
</item>
3030
<item name="custom" xsi:type="array">
31-
<item name="title" xsi:type="string">Custom image</item>
31+
<item name="title" xsi:type="string" translate="true">Custom image</item>
3232
<item name="attribute" xsi:type="string">custom_image</item>
3333
</item>
3434
</argument>

0 commit comments

Comments
 (0)