Fix merge

nicolas-grekas · nicolas-grekas · commit a7ca9fdfffb0 · 2022-03-02T13:56:28.000+01:00
diff --git a/PseudoLocalizationTranslator.php b/PseudoLocalizationTranslator.php
@@ -123,7 +123,7 @@ private function getParts(string $originalTrans): array
             return [[true, true, $originalTrans]];
         }
 
-        $html = mb_convert_encoding($originalTrans, 'HTML-ENTITIES', mb_detect_encoding($originalTrans, null, true) ?: 'UTF-8');
+        $html = mb_encode_numericentity($originalTrans, [0x80, 0xFFFF, 0, 0xFFFF], mb_detect_encoding($originalTrans, null, true) ?: 'UTF-8');
 
         $useInternalErrors = libxml_use_internal_errors(true);
 

Original file line number	Diff line number	Diff line change
`@@ -123,7 +123,7 @@ private function getParts(string $originalTrans): array`
`123`	`123`	`return [[true, true, $originalTrans]];`
`124`	`124`	`}`
`125`	`125`
`126`		`- $html = mb_convert_encoding($originalTrans, 'HTML-ENTITIES', mb_detect_encoding($originalTrans, null, true) ?: 'UTF-8');`
	`126`	`+ $html = mb_encode_numericentity($originalTrans, [0x80, 0xFFFF, 0, 0xFFFF], mb_detect_encoding($originalTrans, null, true) ?: 'UTF-8');`
`127`	`127`
`128`	`128`	`$useInternalErrors = libxml_use_internal_errors(true);`
`129`	`129`