Skip to content

Prefix and Suffix Translation #29217 #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jitendra-cedcoss wants to merge 6 commits into
base: 2.4-develop
Choose a base branch
from
Open

Prefix and Suffix Translation #29217 #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c978cfb
Fix #29217
jitendra-cedcoss Oct 10, 2020
4346a58
Fix #29217
jitendra-cedcoss Oct 10, 2020
7fe920b
Fix #29217
jitendra-cedcoss Oct 10, 2020
306b653
fix #29217
jitendra-cedcoss Oct 10, 2020
bb2a463
Fix #29217
jitendra-cedcoss Oct 10, 2020
3b57262
fix #29217 & updated my commit
jitendra-cedcoss Oct 10, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions app/code/Magento/Customer/Block/Address/Renderer/DefaultRenderer.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,6 +189,8 @@ public function renderArray($addressAttributes, $format = null)
$data[$key] = $v;
}
}
if (in_array($attributeCode, ['prefix', 'suffix']))
$value = __($value);
$data[$attributeCode] = $value;
}
}
Expand Down
4 changes: 2 additions & 2 deletions app/code/Magento/Customer/Helper/View.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ public function getCustomerName(CustomerInterface $customerData)
$name = '';
$prefixMetadata = $this->_customerMetadataService->getAttributeMetadata('prefix');
if ($prefixMetadata->isVisible() && $customerData->getPrefix()) {
$name .= $customerData->getPrefix() . ' ';
$name .= __($customerData->getPrefix()) . ' ';
}

$name .= $customerData->getFirstname();
Expand All @@ -55,7 +55,7 @@ public function getCustomerName(CustomerInterface $customerData)

$suffixMetadata = $this->_customerMetadataService->getAttributeMetadata('suffix');
if ($suffixMetadata->isVisible() && $customerData->getSuffix()) {
$name .= ' ' . $customerData->getSuffix();
$name .= ' ' . __($customerData->getSuffix());
}
return $name;
}
Expand Down
4 changes: 2 additions & 2 deletions app/code/Magento/Customer/Model/Address/AbstractAddress.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@ public function getName()
{
$name = '';
if ($this->_eavConfig->getAttribute('customer_address', 'prefix')->getIsVisible() && $this->getPrefix()) {
$name .= $this->getPrefix() . ' ';
$name .= __($this->getPrefix()) . ' ';
}
$name .= $this->getFirstname();
$middleName = $this->_eavConfig->getAttribute('customer_address', 'middlename');
Expand All @@ -203,7 +203,7 @@ public function getName()
}
$name .= ' ' . $this->getLastname();
if ($this->_eavConfig->getAttribute('customer_address', 'suffix')->getIsVisible() && $this->getSuffix()) {
$name .= ' ' . $this->getSuffix();
$name .= ' ' . __($this->getSuffix());
}
return $name;
}
Expand Down
3 changes: 2 additions & 1 deletion app/code/Magento/Customer/Model/Options.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,8 @@ private function prepareNamePrefixSuffixOptions($options, $isOptional = false)
$result = [];
$options = explode(';', $options);
foreach ($options as $value) {
$result[] = $this->escaper->escapeHtml(trim($value)) ?: ' ';
$value = $this->escaper->escapeHtml(trim($value)) ?: ' ';
$result[] = __($value);
}

if ($isOptional && trim(current($options))) {
Expand Down
4 changes: 2 additions & 2 deletions app/code/Magento/Sales/Model/Order/Address.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,15 +142,15 @@ public function getName()
{
$name = '';
if ($this->getPrefix()) {
$name .= $this->getPrefix() . ' ';
$name .= __($this->getPrefix()) . ' ';
}
$name .= $this->getFirstname();
if ($this->getMiddlename()) {
$name .= ' ' . $this->getMiddlename();
}
$name .= ' ' . $this->getLastname();
if ($this->getSuffix()) {
$name .= ' ' . $this->getSuffix();
$name .= ' ' . __($this->getSuffix());
}
return $name;
}
Expand Down