Merge 308caaa into b892e00

Kdyby · Dec 4, 2018 · a30616c · a30616c
2 parents b892e00 + 308caaa
commit a30616c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/Console/ExtractCommand.php b/src/Console/ExtractCommand.php
@@ -109,7 +109,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
 			return 1;
 		}
 
-		$catalogue = new MessageCatalogue($input->getOption('catalogue-language'));
+		$catalogue = new MessageCatalogue((string) $input->getOption('catalogue-language'));
 		foreach ($this->scanDirs as $dir) {
 			$output->writeln(sprintf('<info>Extracting %s</info>', $dir));
 			$this->extractor->extract($dir, $catalogue);

diff --git a/src/DI/TranslationExtension.php b/src/DI/TranslationExtension.php
@@ -142,7 +142,7 @@ public function loadConfiguration()
 			->setClass(MessageSelector::class);
 
 		$builder->addDefinition($this->prefix('formatter'))
-			->setClass(MessageFormatter::class);
+			->setClass(MessageFormatter::class, [$this->prefix('@selector'), NULL]);
 
 		$builder->addDefinition($this->prefix('extractor'))
 			->setClass(ChainExtractor::class);