Merge pull request #382 from Guite/master

Olivier Dolbeau · web-flow · commit fb560bb48094 · 2020-01-14T09:49:54.000+01:00
Configure bundle dir before fetching catalogues
diff --git a/Catalogue/CatalogueManager.php b/Catalogue/CatalogueManager.php
@@ -58,7 +58,7 @@ public function getMessages(string $locale, string $domain): array
         }
 
         foreach ($this->catalogues[$locale]->all($domain) as $key => $text) {
-            $messages[] = $this->createMessage($this->catalogues[$locale], $locale, $domain, $key, $text);
+            $messages[] = $this->createMessage($this->catalogues[$locale], $locale, $domain, $key, $text ?? '');
         }
 
         return $messages;
diff --git a/Command/ExtractCommand.php b/Command/ExtractCommand.php
@@ -98,8 +98,8 @@ protected function execute(InputInterface $input, OutputInterface $output): int
             $locales = [$inputLocale];
         }
 
-        $catalogues = $this->catalogueFetcher->getCatalogues($config, $locales);
         $this->configureBundleDirs($input, $config);
+        $catalogues = $this->catalogueFetcher->getCatalogues($config, $locales);
         $finder = $this->getConfiguredFinder($config);
 
         $result = $this->importer->extractToCatalogues($finder, $catalogues, [

Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ public function getMessages(string $locale, string $domain): array`
`58`	`58`	`}`
`59`	`59`
`60`	`60`	`foreach ($this->catalogues[$locale]->all($domain) as $key => $text) {`
`61`		`- $messages[] = $this->createMessage($this->catalogues[$locale], $locale, $domain, $key, $text);`
	`61`	`+ $messages[] = $this->createMessage($this->catalogues[$locale], $locale, $domain, $key, $text ?? '');`
`62`	`62`	`}`
`63`	`63`
`64`	`64`	`return $messages;`
Original file line number	Diff line number	Diff line change
`@@ -98,8 +98,8 @@ protected function execute(InputInterface $input, OutputInterface $output): int`
`98`	`98`	`$locales = [$inputLocale];`
`99`	`99`	`}`
`100`	`100`
`101`		`- $catalogues = $this->catalogueFetcher->getCatalogues($config, $locales);`
`102`	`101`	`$this->configureBundleDirs($input, $config);`
	`102`	`+ $catalogues = $this->catalogueFetcher->getCatalogues($config, $locales);`
`103`	`103`	`$finder = $this->getConfiguredFinder($config);`
`104`	`104`
`105`	`105`	`$result = $this->importer->extractToCatalogues($finder, $catalogues, [`