Fix: regex for twig translate did not properly account for possible s…

…paces in twig syntax
statikbe · Jan 24, 2024 · 05a319b · 05a319b
1 parent 5d08f31
commit 05a319b
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/services/Translate.php b/src/services/Translate.php
@@ -39,9 +39,9 @@ class Translate extends Component
         // Regex for |t('category')
         'twig' => array(
             // Single quotes
-            "/'([^']+)'\|(t|translate)/mu",
+            "/'([^']+)'\ *\|\ *(t|translate)/mu",
             // Double quotes
-            '/"([^"]+)"\|(t|translate)/mu',
+            '/"([^"]+)"\ *\|\ *(t|translate)/mu',
         ),
 
         // Regex for Craft.t('category', '..')
@@ -255,7 +255,7 @@ private function _processFile(string $path, string $file, ElementQueryInterface
 
     public function parseString($expression, $string)
     {
-        $string = preg_replace("/\r?\n|\r|\n/", " ",$string);
+        $string = preg_replace("/\r?\n|\r|\n/", " ", $string);
         $string = preg_replace('!\s+!', ' ', $string);
         preg_match_all($expression, $string, $matches);
         return $matches;