Skip to content
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.

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

br tags fixed #39556

Open
wants to merge 1 commit into
base: 2.4-develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions app/code/Magento/Analytics/etc/adminhtml/system.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<label>Advanced Reporting</label>
<comment><![CDATA[This service provides a dynamic suite of reports with rich insights about your business.
Your reports can be accessed securely on a personalized dashboard outside of the admin panel by clicking on the
"Go to Advanced Reporting" link. </br> For more information, see our <a target="_blank" href="https://magento.com/legal/terms/cloud-terms">
"Go to Advanced Reporting" link. <br> For more information, see our <a target="_blank" href="https://magento.com/legal/terms/cloud-terms">
terms and conditions</a>.]]></comment>
<field id="enabled" translate="label" type="select" sortOrder="10" showInDefault="1">
<label>Advanced Reporting Service</label>
Expand Down Expand Up @@ -46,7 +46,7 @@
<field id="additional_comment" translate="label comment" type="label" sortOrder="40" showInDefault="1">
<label><![CDATA[<strong>Get more insights from Magento Business Intelligence</strong>]]></label>
<comment><![CDATA[Magento Business Intelligence provides you with a simple and clear path to
becoming more data driven.</br> Learn more about <a target="_blank"
becoming more data driven.<br> Learn more about <a target="_blank"
href="https://dashboard.rjmetrics.com/v2/magento/signup/">Magento BI Essentials and BI Pro</a> tiers.]]></comment>
<frontend_model>Magento\Analytics\Block\Adminhtml\System\Config\AdditionalComment</frontend_model>
</field>
Expand Down
8 changes: 4 additions & 4 deletions app/code/Magento/Analytics/i18n/en_US.csv
Original file line number Diff line number Diff line change
Expand Up @@ -36,20 +36,20 @@ Configuration,Configuration
"BI Essentials","BI Essentials"
"This service provides a dynamic suite of reports with rich insights about your business.
Your reports can be accessed securely on a personalized dashboard outside of the admin panel by clicking on the
""Go to Advanced Reporting"" link. </br> For more information, see our
""Go to Advanced Reporting"" link. <br> For more information, see our
<a href=""https://magento.com/legal/terms/privacy"">terms and conditions</a>.
","This service provides a dynamic suite of reports with rich insights about your business.
Your reports can be accessed securely on a personalized dashboard outside of the admin panel by clicking on the
""Go to Advanced Reporting"" link. </br> For more information, see our
""Go to Advanced Reporting"" link. <br> For more information, see our
<a href=""https://magento.com/legal/terms/privacy"">terms and conditions</a>."
"Advanced Reporting Service","Advanced Reporting Service"
Industry,Industry
"Time of day to send data","Time of day to send data"
"<strong>Get more insights from Magento Business Intelligence</strong>","<strong>Get more insights from Magento Business Intelligence</strong>"
"Magento Business Intelligence provides you with a simple and clear path to
becoming more data driven.</br> Learn more about <a target=""_blank""
becoming more data driven.<br> Learn more about <a target=""_blank""
href=""https://dashboard.rjmetrics.com/v2/magento/signup/"">BI Essentials</a> tier.","Magento Business Intelligence provides you with a simple and clear path to
becoming more data driven.</br> Learn more about <a target=""_blank""
becoming more data driven.<br> Learn more about <a target=""_blank""
href=""https://dashboard.rjmetrics.com/v2/magento/signup/"">BI Essentials</a> tier."
"Auto Parts","Auto Parts"
"Baby/Children’s Apparel, Gear and Toys","Baby/Children’s Apparel, Gear and Toys"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ public function execute()

$errors = $fileUploader->validate();
if (true !== $errors) {
$errorMessage = implode('</br>', $errors);
$errorMessage = implode('<br>', $errors);
throw new LocalizedException(__($errorMessage));
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ public function execute()

$errors = $fileUploader->validate();
if (true !== $errors) {
$errorMessage = implode('</br>', $errors);
$errorMessage = implode('<br>', $errors);
throw new LocalizedException(__($errorMessage));
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,7 @@ public function testExecuteWithErrors()
$resultJson->expects($this->once())
->method('setData')
->with([
'error' => implode('</br>', $errors),
'error' => implode('<br>', $errors),
'errorcode' => 0,
])
->willReturnSelf();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,7 @@ public function testExecuteWithErrors()
$resultJson->expects($this->once())
->method('setData')
->with([
'error' => implode('</br>', $errors),
'error' => implode('<br>', $errors),
'errorcode' => 0,
])
->willReturnSelf();
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/Eav/Model/Attribute/Data/Multiline.php
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ public function outputValue($format = \Magento\Eav\Model\AttributeDataFactory::O
$output = $values;
break;
case \Magento\Eav\Model\AttributeDataFactory::OUTPUT_FORMAT_HTML:
$output = implode("<br />", $values);
$output = implode("<br/>", $values);
break;
case \Magento\Eav\Model\AttributeDataFactory::OUTPUT_FORMAT_ONELINE:
$output = implode(" ", $values);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<legend class="admin__legend">
<span><?= $block->escapeHtml(__('Entity Attributes')) ?></span>
</legend>
<br />
<br/>
<form id="export_filter_form" action="<?= $block->escapeUrl($block->getUrl('*/*/export')) ?>" method="post">
<input name="form_key" type="hidden" value="<?= /* @noEscape */ $block->getFormKey() ?>" />
<div id="export_filter_grid_container"><!-- --></div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ <h3 translate="'Details'"></h3>
<each args="{ data: value, as: 'item'}">
<div class="value">
<a attr="href: $parents[1].getFilterUrl(item.link)"
text="$parents[1].getUsedInText(item)"></a><br/>
text="$parents[1].getUsedInText(item)"></a><br>
</div>
</each>
</if>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -85,8 +85,8 @@ public static function rendererDataProvider()
],
[
[
'sender' => "<br>'Sender'</br>",
'sender_email' => "<br>'email@example.com'</br>",
'sender' => "'Sender'<br>",
'sender_email' => "'email@example.com'<br>",
],
[
'sender' => "&lt;br&gt;&#039;Sender&#039;&lt;/br&gt;",
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/ProductVideo/i18n/en_US.csv
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ Description,Description
"Hide from Product Page","Hide from Product Page"
Role,Role
"YouTube and Vimeo supported.","YouTube and Vimeo supported."
"Vimeo supported.<br />To add YouTube video, please <a href=""%1"">enter YouTube API Key</a> first.","Vimeo supported.<br />To add YouTube video, please <a href=""%1"">enter YouTube API Key</a> first."
"Vimeo supported.<br/>To add YouTube video, please <a href=""%1"">enter YouTube API Key</a> first.","Vimeo supported.<br/>To add YouTube video, please <a href=""%1"">enter YouTube API Key</a> first."
"Protocol isn't allowed","Protocol isn't allowed"
"Could not get preview image information. Please check your connection and try again.","Could not get preview image information. Please check your connection and try again."
"Add Video","Add Video"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -255,7 +255,7 @@ public function getPriceDataObject()
* @param string $separator
* @return string
*/
public function displayPriceAttribute($code, $strong = false, $separator = '<br />')
public function displayPriceAttribute($code, $strong = false, $separator = '<br/>')
{
if ($code == 'tax_amount' && $this->getOrder()->getRowTaxDisplayPrecision()) {
return $this->displayRoundedPrices(
Expand Down Expand Up @@ -284,7 +284,7 @@ public function displayPriceAttribute($code, $strong = false, $separator = '<br
* @param string $separator
* @return string
*/
public function displayPrices($basePrice, $price, $strong = false, $separator = '<br />')
public function displayPrices($basePrice, $price, $strong = false, $separator = '<br/>')
{
return $this->displayRoundedPrices($basePrice, $price, 2, $strong, $separator);
}
Expand All @@ -299,7 +299,7 @@ public function displayPrices($basePrice, $price, $strong = false, $separator =
* @param string $separator
* @return string
*/
public function displayRoundedPrices($basePrice, $price, $precision = 2, $strong = false, $separator = '<br />')
public function displayRoundedPrices($basePrice, $price, $precision = 2, $strong = false, $separator = '<br/>')
{
if ($this->getOrder()->isCurrencyDifferent()) {
$res = '';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@ private function getTemplateVars(Quote $quote, string $message, string $checkout
'payment/' . $this->getPaymentMethod($quote) . '/title',
$quote
),
'items' => implode('<br />', $this->getQuoteItems($quote)),
'items' => implode('<br/>', $this->getQuoteItems($quote)),
'total' => $quote->getCurrency()->getStoreCurrencyCode() . ' ' . $quote->getGrandTotal(),
];
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ public function execute(Observer $observer)
&& !empty($vatRequestDate)
) {
$orderHistoryComment = __('VAT Request Identifier')
. ': ' . $vatRequestId . '<br />'
. ': ' . $vatRequestId . '<br/>'
. __('VAT Request Date') . ': ' . $vatRequestDate;
$orderInstance->addStatusHistoryComment($orderHistoryComment, false);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,7 @@ public static function tierPriceDataProvider()
],
[
[['price' => 100, 'price_qty' => 1], ['price' => 200, 'price_qty' => 2]],
'1 with 100% discount each<br />2 with 200% discount each',
'1 with 100% discount each<br/>2 with 200% discount each',
Type::TYPE_BUNDLE
],
[
Expand All @@ -223,7 +223,7 @@ public static function tierPriceDataProvider()
],
[
[['price' => 50, 'price_qty' => 2], ['price' => 150, 'price_qty' => 3]],
'2 for 50<br />3 for 150',
'2 for 50<br/>3 for 150',
Type::TYPE_SIMPLE
],
[0, '', Type::TYPE_SIMPLE]
Expand Down
4 changes: 2 additions & 2 deletions app/code/Magento/Sales/etc/adminhtml/system.xml
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
<upload_dir config="system/filesystem/media" scope_info="1">sales/store/logo</upload_dir>
<base_url type="media" scope_info="1">sales/store/logo</base_url>
<comment>
<![CDATA[Your default logo will be used in PDF and HTML documents.<br />(jpeg, tiff, png) If your pdf image is distorted, try to use larger file-size image.]]>
<![CDATA[Your default logo will be used in PDF and HTML documents.<br/>(jpeg, tiff, png) If your pdf image is distorted, try to use larger file-size image.]]>
</comment>
</field>
<field id="logo_html" translate="label comment" type="image" sortOrder="150" showInDefault="1" showInWebsite="1" showInStore="1">
Expand All @@ -77,7 +77,7 @@
<upload_dir config="system/filesystem/media" scope_info="1">sales/store/logo_html</upload_dir>
<base_url type="media" scope_info="1">sales/store/logo_html</base_url>
<comment>
<![CDATA[Logo for HTML documents only. If empty, default will be used.<br />(jpeg, gif, png)]]>
<![CDATA[Logo for HTML documents only. If empty, default will be used.<br/>(jpeg, gif, png)]]>
</comment>
</field>
<field id="address" translate="label" type="textarea" sortOrder="200" showInDefault="1" showInWebsite="1" showInStore="1">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ $catalogHelper =$block->getData('catalogHelper');
<div class="product-sku-block">
<span><?= $block->escapeHtml(__('SKU')) ?>:</span>
<?= /* @noEscape */ implode(
'<br />',
'<br/>',
$catalogHelper->splitSku($block->escapeHtml($_item->getSku()))
) ?>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
<?php if ($percent !== null) : ?>
(<?= (float) $percent ?>%)
<?php endif; ?>
<br />
<br/>
</td>
<td <?= /* @noEscape */ $block->getValueProperties() ?> rowspan="1">
<?= /* @noEscape */ $_order->formatPrice($amount) ?>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ protected function _addThemeCssFieldset()
'href' => $this->getDownloadUrl($fileId, $this->_getCurrentTheme()->getId()),
'label' => $fileId,
'title' => $asset->getPath(),
'delimiter' => '<br />',
'delimiter' => '<br/>',
];
}
$themeFieldset->addField(
Expand Down Expand Up @@ -260,7 +260,7 @@ protected function _getUploadCssFileNote()
$messages[] = __('Something is wrong with the file upload settings.');
}

return implode('<br />', $messages);
return implode('<br/>', $messages);
}

/**
Expand Down
4 changes: 2 additions & 2 deletions app/code/Magento/User/i18n/en_US.csv
Original file line number Diff line number Diff line change
Expand Up @@ -109,8 +109,8 @@ username,username
Custom,Custom
All,All
Resources,Resources
"Warning!<br>This action will remove this user from already assigned role.<br>Are you sure?","Warning!<br>This action will remove this user from already assigned role.<br>Are you sure?"
"Warning!<br>This action will remove those users from already assigned roles.<br>Are you sure?","Warning!<br>This action will remove those users from already assigned roles.<br>Are you sure?"
"Warning!<br>This action will remove this user from already assigned role.<br />Are you sure?","Warning!<br />This action will remove this user from already assigned role.<br />Are you sure?"
"Warning!<br>This action will remove those users from already assigned roles.<br />Are you sure?","Warning!<br />This action will remove those users from already assigned roles.<br />Are you sure?"
"New admin user '%user_name' created","New admin user '%user_name' created"
"Hello,","Hello,"
"A new admin account was created for %first_name, %last_name using %email.","A new admin account was created for %first_name, %last_name using %email."
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@
?>
<fieldset class="fieldset">
<legend class="legend"><span><?= $block->escapeHtml(__('Role Users')) ?></span></legend>
<br />
<br/>
<?= $block->getGridHtml() ?>
</fieldset>