Skip to content

Commit e32db8c

Browse files
ishakhsuvarovishakhsuvarov
committed
Merge branch 'prefix-and-suffix-translation-29217' of github.com:solwininfotech/magento2 into 2.4-develop-prs
2 parents ccd4588 + beeca7f commit e32db8c

File tree

6 files changed

+66
-33
lines changed

6 files changed

+66
-33
lines changed

‎app/code/Magento/Customer/Block/Address/Renderer/DefaultRenderer.php‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -189,6 +189,9 @@ public function renderArray($addressAttributes, $format = null)
189189
$data[$key] = $v;
190190
}
191191
}
192+
if (in_array($attributeCode, ['prefix','suffix'])) {
193+
$value = __($value);
194+
}
192195
$data[$attributeCode] = $value;
193196
}
194197
}

‎app/code/Magento/Customer/Helper/View.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ public function getCustomerName(CustomerInterface $customerData)
5151
$name = '';
5252
$prefixMetadata = $this->_customerMetadataService->getAttributeMetadata('prefix');
5353
if ($prefixMetadata->isVisible() && $customerData->getPrefix()) {
54-
$name .= $customerData->getPrefix() . ' ';
54+
$name .= __($customerData->getPrefix()) . ' ';
5555
}
5656

5757
$name .= $customerData->getFirstname();
@@ -65,7 +65,7 @@ public function getCustomerName(CustomerInterface $customerData)
6565

6666
$suffixMetadata = $this->_customerMetadataService->getAttributeMetadata('suffix');
6767
if ($suffixMetadata->isVisible() && $customerData->getSuffix()) {
68-
$name .= ' ' . $customerData->getSuffix();
68+
$name .= ' ' . __($customerData->getSuffix());
6969
}
7070

7171
return $this->escaper->escapeHtml($name);

‎app/code/Magento/Customer/Model/Address/AbstractAddress.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ public function getName()
197197
{
198198
$name = '';
199199
if ($this->_eavConfig->getAttribute('customer_address', 'prefix')->getIsVisible() && $this->getPrefix()) {
200-
$name .= $this->getPrefix() . ' ';
200+
$name .= __($this->getPrefix()) . ' ';
201201
}
202202
$name .= $this->getFirstname();
203203
$middleName = $this->_eavConfig->getAttribute('customer_address', 'middlename');
@@ -206,7 +206,7 @@ public function getName()
206206
}
207207
$name .= ' ' . $this->getLastname();
208208
if ($this->_eavConfig->getAttribute('customer_address', 'suffix')->getIsVisible() && $this->getSuffix()) {
209-
$name .= ' ' . $this->getSuffix();
209+
$name .= ' ' . __($this->getSuffix());
210210
}
211211
return $name;
212212
}

‎app/code/Magento/Customer/Model/Options.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ private function prepareNamePrefixSuffixOptions($options, $isOptional = false)
100100
$options = explode(';', trim($options));
101101

102102
foreach ($options as $value) {
103-
$result[] = $this->escaper->escapeHtml(trim($value)) ?: ' ';
103+
$result[] = $this->escaper->escapeHtml(trim(__($value))) ?: ' ';
104104
}
105105

106106
if ($isOptional && trim(current($options))) {

‎app/code/Magento/Customer/view/frontend/templates/widget/name.phtml‎

Lines changed: 56 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -24,31 +24,40 @@ $prefix = $block->showPrefix();
2424
$middle = $block->showMiddlename();
2525
$suffix = $block->showSuffix();
2626
?>
27-
<?php if (($prefix || $middle || $suffix) && !$block->getNoWrap()) : ?>
27+
<?php if (($prefix || $middle || $suffix) && !$block->getNoWrap()): ?>
2828
<div class="field required fullname <?= $block->escapeHtmlAttr($block->getContainerClassName()) ?>">
29-
<label for="<?= $block->escapeHtmlAttr($block->getFieldId('firstname')) ?>" class="label"><span><?= $block->escapeHtml(__('Name')) ?></span></label>
29+
<label for="<?= $block->escapeHtmlAttr($block->getFieldId('firstname')) ?>" class="label">
30+
<span><?= $block->escapeHtml(__('Name')) ?></span>
31+
</label>
3032
<div class="control">
3133
<fieldset class="fieldset fieldset-fullname">
3234
<div class="fields">
3335
<?php endif; ?>
3436

35-
<?php if ($prefix) : ?>
37+
<?php if ($prefix): ?>
3638
<div class="field field-name-prefix<?= $block->isPrefixRequired() ? ' required' : '' ?>">
37-
<label class="label" for="<?= $block->escapeHtmlAttr($block->getFieldId('prefix')) ?>"><span><?= $block->escapeHtml($block->getStoreLabel('prefix')) ?></span></label>
39+
<label class="label" for="<?= $block->escapeHtmlAttr($block->getFieldId('prefix')) ?>">
40+
<span><?= $block->escapeHtml($block->getStoreLabel('prefix')) ?></span>
41+
</label>
3842
<div class="control">
39-
<?php if ($block->getPrefixOptions() === false) : ?>
43+
<?php if ($block->getPrefixOptions() === false): ?>
4044
<input type="text" id="<?= $block->escapeHtmlAttr($block->getFieldId('prefix')) ?>"
4145
name="<?= $block->escapeHtmlAttr($block->getFieldName('prefix')) ?>"
4246
value="<?= $block->escapeHtmlAttr($block->getObject()->getPrefix()) ?>"
4347
title="<?= $block->escapeHtmlAttr($block->getStoreLabel('prefix')) ?>"
44-
class="input-text <?= $block->escapeHtmlAttr($block->getAttributeValidationClass('prefix')) ?>" <?= $block->isPrefixRequired() ? ' data-validate="{required:true}"' : '' ?>>
45-
<?php else : ?>
48+
class="input-text
49+
<?= $block->escapeHtmlAttr($block->getAttributeValidationClass('prefix')) ?>"
50+
<?= $block->isPrefixRequired() ? ' data-validate="{required:true}"' : '' ?>>
51+
<?php else: ?>
4652
<select id="<?= $block->escapeHtmlAttr($block->getFieldId('prefix')) ?>"
4753
name="<?= $block->escapeHtmlAttr($block->getFieldName('prefix')) ?>"
4854
title="<?= $block->escapeHtmlAttr($block->getStoreLabel('prefix')) ?>"
49-
class="<?= $block->escapeHtmlAttr($block->getAttributeValidationClass('prefix')) ?>" <?= $block->isPrefixRequired() ? ' data-validate="{required:true}"' : '' ?> >
50-
<?php foreach ($block->getPrefixOptions() as $_option) : ?>
51-
<option value="<?= $block->escapeHtmlAttr($_option) ?>"<?php if ($block->getObject()->getPrefix() == $_option) : ?> selected="selected"<?php endif; ?>>
55+
class="<?= $block->escapeHtmlAttr($block->getAttributeValidationClass('prefix')) ?>"
56+
<?= $block->isPrefixRequired() ? ' data-validate="{required:true}"' : '' ?> >
57+
<?php foreach ($block->getPrefixOptions() as $_option): ?>
58+
<option value="<?= $block->escapeHtmlAttr(__($_option)) ?>"
59+
<?php if ($block->getObject()->getPrefix() == $_option): ?>
60+
selected="selected"<?php endif; ?>>
5261
<?= $block->escapeHtml(__($_option)) ?>
5362
</option>
5463
<?php endforeach; ?>
@@ -58,55 +67,76 @@ $suffix = $block->showSuffix();
5867
</div>
5968
<?php endif; ?>
6069
<div class="field field-name-firstname required">
61-
<label class="label" for="<?= $block->escapeHtmlAttr($block->getFieldId('firstname')) ?>"><span><?= $block->escapeHtml($block->getStoreLabel('firstname')) ?></span></label>
70+
<label class="label" for="<?= $block->escapeHtmlAttr($block->getFieldId('firstname')) ?>">
71+
<span><?= $block->escapeHtml($block->getStoreLabel('firstname')) ?></span>
72+
</label>
6273
<div class="control">
6374
<input type="text" id="<?= $block->escapeHtmlAttr($block->getFieldId('firstname')) ?>"
6475
name="<?= $block->escapeHtmlAttr($block->getFieldName('firstname')) ?>"
6576
value="<?= $block->escapeHtmlAttr($block->getObject()->getFirstname()) ?>"
6677
title="<?= $block->escapeHtmlAttr($block->getStoreLabel('firstname')) ?>"
67-
class="input-text <?= $block->escapeHtmlAttr($block->getAttributeValidationClass('firstname')) ?>" <?= ($block->getAttributeValidationClass('firstname') == 'required-entry') ? ' data-validate="{required:true}"' : '' ?>>
78+
class="input-text
79+
<?= $block->escapeHtmlAttr($block->getAttributeValidationClass('firstname')) ?>"
80+
<?= ($block->getAttributeValidationClass('firstname') == 'required-entry') ? '
81+
data-validate="{required:true}"' : '' ?>>
6882
</div>
6983
</div>
70-
<?php if ($middle) : ?>
84+
<?php if ($middle): ?>
7185
<?php $isMiddlenameRequired = $block->isMiddlenameRequired(); ?>
7286
<div class="field field-name-middlename<?= $isMiddlenameRequired ? ' required' : '' ?>">
73-
<label class="label" for="<?= $block->escapeHtmlAttr($block->getFieldId('middlename')) ?>"><span><?= $block->escapeHtml($block->getStoreLabel('middlename')) ?></span></label>
87+
<label class="label" for="<?= $block->escapeHtmlAttr($block->getFieldId('middlename')) ?>">
88+
<span><?= $block->escapeHtml($block->getStoreLabel('middlename')) ?></span>
89+
</label>
7490
<div class="control">
7591
<input type="text" id="<?= $block->escapeHtmlAttr($block->getFieldId('middlename')) ?>"
7692
name="<?= $block->escapeHtmlAttr($block->getFieldName('middlename')) ?>"
7793
value="<?= $block->escapeHtmlAttr($block->getObject()->getMiddlename()) ?>"
7894
title="<?= $block->escapeHtmlAttr($block->getStoreLabel('middlename')) ?>"
79-
class="input-text <?= $block->escapeHtmlAttr($block->getAttributeValidationClass('middlename')) ?>" <?= $isMiddlenameRequired ? ' data-validate="{required:true}"' : '' ?>>
95+
class="input-text
96+
<?= $block->escapeHtmlAttr($block->getAttributeValidationClass('middlename')) ?>"
97+
<?= $isMiddlenameRequired ? ' data-validate="{required:true}"' : '' ?>>
8098
</div>
8199
</div>
82100
<?php endif; ?>
83101
<div class="field field-name-lastname required">
84-
<label class="label" for="<?= $block->escapeHtmlAttr($block->getFieldId('lastname')) ?>"><span><?= $block->escapeHtml($block->getStoreLabel('lastname')) ?></span></label>
102+
<label class="label" for="<?= $block->escapeHtmlAttr($block->getFieldId('lastname')) ?>">
103+
<span><?= $block->escapeHtml($block->getStoreLabel('lastname')) ?></span>
104+
</label>
85105
<div class="control">
86106
<input type="text" id="<?= $block->escapeHtmlAttr($block->getFieldId('lastname')) ?>"
87107
name="<?= $block->escapeHtmlAttr($block->getFieldName('lastname')) ?>"
88108
value="<?= $block->escapeHtmlAttr($block->getObject()->getLastname()) ?>"
89109
title="<?= $block->escapeHtmlAttr($block->getStoreLabel('lastname')) ?>"
90-
class="input-text <?= $block->escapeHtmlAttr($block->getAttributeValidationClass('lastname')) ?>" <?= ($block->getAttributeValidationClass('lastname') == 'required-entry') ? ' data-validate="{required:true}"' : '' ?>>
110+
class="input-text
111+
<?= $block->escapeHtmlAttr($block->getAttributeValidationClass('lastname')) ?>"
112+
<?= ($block->getAttributeValidationClass('lastname') == 'required-entry') ? '
113+
data-validate="{required:true}"' : '' ?>>
91114
</div>
92115
</div>
93-
<?php if ($suffix) : ?>
116+
<?php if ($suffix): ?>
94117
<div class="field field-name-suffix<?= $block->isSuffixRequired() ? ' required' : '' ?>">
95-
<label class="label" for="<?= $block->escapeHtmlAttr($block->getFieldId('suffix')) ?>"><span><?= $block->escapeHtml($block->getStoreLabel('suffix')) ?></span></label>
118+
<label class="label" for="<?= $block->escapeHtmlAttr($block->getFieldId('suffix')) ?>">
119+
<span><?= $block->escapeHtml($block->getStoreLabel('suffix')) ?></span>
120+
</label>
96121
<div class="control">
97-
<?php if ($block->getSuffixOptions() === false) : ?>
122+
<?php if ($block->getSuffixOptions() === false): ?>
98123
<input type="text" id="<?= $block->escapeHtmlAttr($block->getFieldId('suffix')) ?>"
99124
name="<?= $block->escapeHtmlAttr($block->getFieldName('suffix')) ?>"
100125
value="<?= $block->escapeHtmlAttr($block->getObject()->getSuffix()) ?>"
101126
title="<?= $block->escapeHtmlAttr($block->getStoreLabel('suffix')) ?>"
102-
class="input-text <?= $block->escapeHtmlAttr($block->getAttributeValidationClass('suffix')) ?>" <?= $block->isSuffixRequired() ? ' data-validate="{required:true}"' : '' ?>>
103-
<?php else : ?>
127+
class="input-text
128+
<?= $block->escapeHtmlAttr($block->getAttributeValidationClass('suffix')) ?>"
129+
<?= $block->isSuffixRequired() ? ' data-validate="{required:true}"' : '' ?>>
130+
<?php else: ?>
104131
<select id="<?= $block->escapeHtmlAttr($block->getFieldId('suffix')) ?>"
105132
name="<?= $block->escapeHtmlAttr($block->getFieldName('suffix')) ?>"
106133
title="<?= $block->escapeHtmlAttr($block->getStoreLabel('suffix')) ?>"
107-
class="<?= $block->escapeHtmlAttr($block->getAttributeValidationClass('suffix')) ?>" <?= $block->isSuffixRequired() ? ' data-validate="{required:true}"' : '' ?>>
108-
<?php foreach ($block->getSuffixOptions() as $_option) : ?>
109-
<option value="<?= $block->escapeHtmlAttr($_option) ?>"<?php if ($block->getObject()->getSuffix() == $_option) : ?> selected="selected"<?php endif; ?>>
134+
class="<?= $block->escapeHtmlAttr($block->getAttributeValidationClass('suffix')) ?>"
135+
<?= $block->isSuffixRequired() ? ' data-validate="{required:true}"' : '' ?>>
136+
<?php foreach ($block->getSuffixOptions() as $_option): ?>
137+
<option value="<?= $block->escapeHtmlAttr(__($_option)) ?>"
138+
<?php if ($block->getObject()->getSuffix() == $_option): ?>
139+
selected="selected"<?php endif; ?>>
110140
<?= $block->escapeHtml(__($_option)) ?>
111141
</option>
112142
<?php endforeach; ?>
@@ -116,7 +146,7 @@ $suffix = $block->showSuffix();
116146
</div>
117147
<?php endif; ?>
118148

119-
<?php if (($prefix || $middle || $suffix) && !$block->getNoWrap()) : ?>
149+
<?php if (($prefix || $middle || $suffix) && !$block->getNoWrap()): ?>
120150
</div>
121151
</fieldset>
122152
</div>

‎app/code/Magento/Sales/Model/Order/Address.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -142,15 +142,15 @@ public function getName()
142142
{
143143
$name = '';
144144
if ($this->getPrefix()) {
145-
$name .= $this->getPrefix() . ' ';
145+
$name .= __($this->getPrefix()) . ' ';
146146
}
147147
$name .= $this->getFirstname();
148148
if ($this->getMiddlename()) {
149149
$name .= ' ' . $this->getMiddlename();
150150
}
151151
$name .= ' ' . $this->getLastname();
152152
if ($this->getSuffix()) {
153-
$name .= ' ' . $this->getSuffix();
153+
$name .= ' ' . __($this->getSuffix());
154154
}
155155
return $name;
156156
}

0 commit comments

Comments
 (0)