Fix nbsp handling

matecat · Sep 7, 2023 · f9c0112 · f9c0112
1 parent 8cac260
commit f9c0112
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 43 deletions.
diff --git a/src/Filters/RemoveNBSPPlaceholder.php b/src/Filters/RemoveNBSPPlaceholder.php
diff --git a/src/Filters/RestoreNBSPPlaceholders.php b/src/Filters/RestoreNBSPPlaceholders.php
diff --git a/src/Filters/SpacesToNBSPForView.php b/src/Filters/SpacesToNBSPForView.php
@@ -10,7 +10,7 @@
 namespace Matecat\SubFiltering\Filters;
 
 use Matecat\SubFiltering\Commons\AbstractHandler;
-use Matecat\SubFiltering\Utils\CatUtils;
+use Matecat\SubFiltering\Enum\ConstantEnum;
 
 class SpacesToNBSPForView extends AbstractHandler {
 
@@ -23,15 +23,16 @@ public function transform( $segment ) {
         $segment = str_ireplace(
                 [
                         '&#10;', '&#13;', ' ' /* NBSP in ascii value */,
-                        '&#0A;', '&#0C;', '&#nbsp;'
+                        '&#0A;', '&#0C;', '&nbsp;', '&#160;',
                 ],
                 [
-                        CatUtils::lfPlaceholder,
-                        CatUtils::crPlaceholder,
-                        CatUtils::nbspPlaceholder,
-                        CatUtils::lfPlaceholder,
-                        CatUtils::crPlaceholder,
-                        CatUtils::nbspPlaceholder
+                    ConstantEnum::lfPlaceholder,
+                    ConstantEnum::crPlaceholder,
+                    ConstantEnum::nbspPlaceholder,
+                    ConstantEnum::lfPlaceholder,
+                    ConstantEnum::crPlaceholder,
+                    ConstantEnum::nbspPlaceholder,
+                    ConstantEnum::nbspPlaceholder
                 ], $segment );
 
         return $segment;

diff --git a/src/MateCatFilter.php b/src/MateCatFilter.php
@@ -23,9 +23,7 @@
 use Matecat\SubFiltering\Filters\PlaceHoldXliffTags;
 use Matecat\SubFiltering\Filters\RemoveCTypeFromPhTags;
 use Matecat\SubFiltering\Filters\RemoveDangerousChars;
-use Matecat\SubFiltering\Filters\RemoveNBSPPlaceholder;
 use Matecat\SubFiltering\Filters\RestoreEquivTextPhToXliffOriginal;
-use Matecat\SubFiltering\Filters\RestoreNBSPPlaceholders;
 use Matecat\SubFiltering\Filters\RestorePlaceHoldersToXLIFFLtGt;
 use Matecat\SubFiltering\Filters\RestoreTabsPlaceholders;
 use Matecat\SubFiltering\Filters\RestoreXliffTagsContent;
@@ -93,7 +91,6 @@ public function fromLayer1ToLayer2( $segment ) {
         $channel->addLast( new SpacesToNBSPForView() );
         $channel->addLast( new RestoreXliffTagsForView() );
         $channel->addLast( new RestoreTabsPlaceholders() );
-        $channel->addLast( new RestoreNBSPPlaceholders() );
         $channel->addLast( new HtmlPlainTextDecoder() );
         $channel->addLast( new LtGtDoubleEncode() );
         $channel->addLast( new LtGtEncode() );
@@ -191,7 +188,6 @@ public function fromLayer0ToLayer1( $segment ) {
     public function fromLayer1ToLayer0( $segment ) {
         $channel = new Pipeline( $this->source, $this->target, $this->dataRefMap );
         $channel->addLast( new DataRefRestore() );
-        $channel->addLast( new RemoveNBSPPlaceholder() );
         $channel->addLast( new FromViewNBSPToSpaces() );
         $channel->addLast( new CtrlCharsPlaceHoldToAscii() );
         $channel->addLast( new MateCatCustomPHToStandardPH() );

diff --git a/tests/MateCatSubFilteringTest.php b/tests/MateCatSubFilteringTest.php
@@ -265,14 +265,14 @@ public function testHTMLFromLayer2() {
 
     public function testNbsp() {
         $filter           = $this->getFilterInstance();
+
         $expected_segment = '   Test';
         $string_from_UI   = ConstantEnum::nbspPlaceholder.ConstantEnum::nbspPlaceholder.ConstantEnum::nbspPlaceholder.'Test';
 
         $this->assertEquals( $expected_segment, $filter->fromLayer2ToLayer0( $string_from_UI ) );
         $this->assertEquals( $string_from_UI, $filter->fromLayer0ToLayer2( $expected_segment ) );
     }
 
-
     /**
      **************************
      * Sprintf