Merge pull request #60 from bedita/fix/command-domain-match

Handle domains with double quotes
bedita · Jun 9, 2022 · 7446e68 · 7446e68
2 parents 32c24f0 + cecbfd1
commit 7446e68
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/src/Command/GettextCommand.php b/src/Command/GettextCommand.php
@@ -446,8 +446,8 @@ private function parseContentSecondArg($start, $content, $options): void
 
         $limit = count($matches[0]);
         for ($i = 0; $i < $limit; $i++) {
-            $domain = $matches[3][$i];
-            $str = $matches[4][$i];
+            $domain = !empty($matches[1][$i]) ? $matches[1][$i] : $matches[3][$i];
+            $str = !empty($matches[2][$i]) ? $matches[2][$i] : $matches[4][$i];
 
             // context not handled for now
             if (strpos($start, '__x') === 0) {

diff --git a/tests/TestCase/Command/GettextCommandTest.php b/tests/TestCase/Command/GettextCommandTest.php
@@ -345,6 +345,8 @@ public function parseFileProvider(): array
                     ],
                     'DomainSampleD' => [
                         'A twig string in a domain',
+                        'A twig string in a domain in double quotes',
+                        'A twig string in a domain with {0}',
                     ],
                 ],
             ],
@@ -403,6 +405,8 @@ public function parseDirProvider(): array
                     ],
                     'DomainSampleD' => [
                         'A twig string in a domain',
+                        'A twig string in a domain in double quotes',
+                        'A twig string in a domain with {0}',
                         '1 test __d',
                     ],
                     'DomainSampleDN' => [

diff --git a/tests/files/gettext/contents/sample.twig b/tests/files/gettext/contents/sample.twig
@@ -7,3 +7,7 @@
 {{ __('A twig string with \'single quotes\'', true) }}
 
 {{ __d('DomainSampleD', 'A twig string in a domain') }}
+
+{{ __d("DomainSampleD", "A twig string in a domain in double quotes") }}
+
+{{ __d('DomainSampleD', 'A twig string in a domain with {0}') }}