minor #20433 Revert "bug #20184 [FrameworkBundle] Convert null prefix to an empty string in translation:update (chalasr)" (chalasr)

fabpot · fabpot · commit 589d019f2e31 · 2016-11-07T07:14:01.000-08:00
This PR was merged into the 2.7 branch. Discussion ---------- Revert "bug #20184 [FrameworkBundle] Convert null prefix to an empty string in translation:update (chalasr)" | Q | A | ------------- | --- | Branch? | 2.7 | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #20184 (comment) | License | MIT | Doc PR | n/a This reverts commit 3f650f8 because the fix is not valid. It is actually not possible to have an option with value optional given empty to be `empty` if this one has a default value. The default value will always be the one returned, see #20184 (comment) for details. Commits ------- b2fa7c4 Revert "bug #20184 [FrameworkBundle] Convert null prefix to an empty string in translation:update (chalasr)"
diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/TranslationUpdateCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/TranslationUpdateCommand.php
@@ -118,9 +118,8 @@ protected function execute(InputInterface $input, OutputInterface $output)
         // load any messages from templates
         $extractedCatalogue = new MessageCatalogue($input->getArgument('locale'));
         $output->text('Parsing templates');
-        $prefix = $input->getOption('prefix');
         $extractor = $this->getContainer()->get('translation.extractor');
-        $extractor->setPrefix(null === $prefix ? '' : $prefix);
+        $extractor->setPrefix($input->getOption('prefix'));
         foreach ($transPaths as $path) {
             $path .= 'views';
             if (is_dir($path)) {
