Skip to content

14183-Translation-\n-vs-\rn #48

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
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

14183-Translation-\n-vs-\rn #48

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 8 additions & 4 deletions ...o/Framework/Phrase/Renderer/Translate.php → ...o/Framework/Phrase/Renderer/Translate.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,21 +6,25 @@

declare(strict_types=1);

namespace Magefan\Translation\Rewrite\Magento\Framework\Phrase\Renderer;
namespace Magefan\Translation\Plugin\Magento\Framework\Phrase\Renderer;


class Translate extends \Magento\Framework\Phrase\Renderer\Translate
{

/**
* Render source text
* Render source text fix for \n \rn
*
* @return string
* @throws \Exception
* @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function render(array $source, array $arguments)
{
public function aroundRender(
\Magento\Framework\Phrase\Renderer\Translate $subject,
callable $proceed,
array $source,
array $arguments
){
$text = end($source);
/* If phrase contains escaped quotes then use translation for phrase with non-escaped quote */
$text = strtr($text, ['\"' => '"', "\\'" => "'"]);
Expand Down
7 changes: 5 additions & 2 deletions etc/di.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,6 @@
type="Magefan\Translation\Model\TranslationRepository" />
<preference for="Magefan\Translation\Api\ConfigInterface"
type="Magefan\Translation\Model\Config" />
<preference for="Magento\Framework\Phrase\Renderer\Translate"
type="Magefan\Translation\Rewrite\Magento\Framework\Phrase\Renderer\Translate"/>
<virtualType name="TranslationGridDataProvider" type="Magento\Framework\View\Element\UiComponent\DataProvider\DataProvider">
<arguments>
<argument name="collection" xsi:type="object" shared="false">Magefan\Translation\Model\ResourceModel\Translation\Collection</argument>
Expand Down Expand Up @@ -51,4 +49,9 @@
</argument>
</arguments>
</type>
<type name="Magento\Framework\Phrase\Renderer\Translate">
<plugin name="magefan_translation_renderer_translate_plugin"
type="Magefan\Translation\Plugin\Magento\Framework\Phrase\Renderer\Translate"
sortOrder="10" />
</type>
</config>