itk_translation_extractor

Author: rimi-itk

src/Command/TranslationExtractCommand.php

@@ -83,7 +83,7 @@ protected function configure(): void
               new InputOption('dump-messages', null, InputOption::VALUE_NONE, 'Should the messages be dumped in the console'),
               new InputOption('force', null, InputOption::VALUE_NONE, 'Should the extract be done'),
               new InputOption('clean', null, InputOption::VALUE_NONE, 'Should clean not found messages'),
-              // new InputOption('domain', null, InputOption::VALUE_REQUIRED, 'Specify the domain to extract'),
+              new InputOption('domain', null, InputOption::VALUE_REQUIRED, 'Specify the domain to extract'),
               new InputOption('sort', null, InputOption::VALUE_REQUIRED, 'Return list of messages sorted alphabetically'),
               new InputOption('as-tree', null, InputOption::VALUE_REQUIRED, 'Dump the messages as a tree-like structure: The given value defines the level where to switch to inline YAML'),
 
@@ -201,12 +201,17 @@ protected function execute(InputInterface $input, OutputInterface $output): int
         // $currentCatalogue = $this->loadCurrentMessages($input->getArgument('locale'), $transPaths);
 
         $io->comment('Loading translated messages...');
-        $currentCatalogue = $this->loadTranslatedMessages($extractedCatalogue);
+        $currentCatalogue = true === $input->getOption('no-fill')
+          ? $extractedCatalogue
+          : $this->loadTranslatedMessages($extractedCatalogue);
 
-        // if (null !== $domain = $input->getOption('domain')) {
-        //   $currentCatalogue = $this->filterCatalogue($currentCatalogue, $domain);
-        //   $extractedCatalogue = $this->filterCatalogue($extractedCatalogue, $domain);
-        // }
+        if (null !== $domain = $input->getOption('domain')) {
+            if ('' === $domain) {
+                $domain = PoItem::NO_CONTEXT;
+            }
+            $currentCatalogue = $this->filterCatalogue($currentCatalogue, $domain);
+            $extractedCatalogue = $this->filterCatalogue($extractedCatalogue, $domain);
+        }
 
         // process catalogues
         $operation = $input->getOption('clean')
@@ -451,7 +456,6 @@ private function loadTranslatedMessages(MessageCatalogue $extractedCatalogue)
                 if ($translation = ($translations[$source] ?? null)) {
                     if ($string = $translation->getString()) {
                         $currentCatalogue->set($source, $string, $domain);
-                        $currentCatalogue->setMetadata($source, ['plurals' => $translation->getPlurals()], $domain);
                     }
                 }
             }

src/Translation/TwigExtractor.php

@@ -22,6 +22,11 @@ public function __construct(
         parent::__construct($this->twig);
     }
 
+    public function setPrefix(string $prefix): void
+    {
+        $this->prefix = $prefix;
+    }
+
     protected function extractTemplate(string $template, MessageCatalogue $catalogue): void
     {
         $visitor = $this->twig->getExtension(ItkTranslationExtractorTwigExtension::class)->getTranslationNodeVisitor();
@@ -31,7 +36,7 @@ protected function extractTemplate(string $template, MessageCatalogue $catalogue
         foreach ($visitor->getMessages() as $message) {
             $id = trim($message[0]);
             // $translation = Helper::joinStrings(...array_map(static fn (string $string) => '', [...Helper::splitStrings($id)]));
-            $translation = $this->prefix.trim($message[0]);
+            $translation = PoItem::joinStrings(...array_map(fn (string $string) => $this->prefix.$string, PoItem::splitStrings($id)));
             $domain = $message[1] ?: PoItem::NO_CONTEXT;
             $catalogue->set($id, $translation, $domain);
         }

tests/Unit/Extractor/PoFileDumperTest.php

@@ -51,6 +51,39 @@ public function testFormatCatalogDa(): void
         }
     }
 
+    public function testFormatCatalogDaWithPrefix(): void
+    {
+        $resource = __DIR__.'/resources/';
+        $locale = 'da';
+
+        $extractor = new TwigExtractor($this->twig());
+        $messages = new MessageCatalogue($locale);
+        $extractor->setPrefix('__');
+        $extractor->extract($resource, $messages);
+
+        $dumper = new PoFileDumper();
+        $output = $dumper->formatCatalogue($messages, '', [
+            'project_name' => 'testFormatCatalog',
+        ]);
+
+        $strings = [
+            $this->block([
+                'msgctxt "the context"',
+                'msgid "t filter with options context"',
+                'msgstr "__t filter with options context"',
+            ]),
+            $this->block([
+                'msgid "Hello star."',
+                'msgid_plural "Hello @count stars."',
+                'msgstr[0] "__Hello star."',
+                'msgstr[1] "__Hello @count stars."',
+            ]),
+        ];
+        foreach ($strings as $string) {
+            $this->assertStringContainsString($string, $output);
+        }
+    }
+
     public function testFormatCatalogPl(): void
     {
         $resource = __DIR__.'/resources/';