Skip to content

Commit ff62c1e

Browse files
committed
Merge branch '2.8' into 3.1
* 2.8: [TwigBridge] fix tests Tag the FormFieldRegistry as being internal [Form] Fix Date\TimeType marked as invalid on request with single_text and zero seconds [Validator] Added missing swedish translation [TranslationDebug] workaround for getFallbackLocales. [Translation] fixed nested fallback catalogue using multiple locales. fixed phpdoc [Command] Fixed method comments as phpDoc syntax Added single quotes for upgrade guides.
2 parents 49e1faa + dae0501 commit ff62c1e

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

Command/TranslationDebugCommand.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@
2121
use Symfony\Component\Translation\Catalogue\MergeOperation;
2222
use Symfony\Component\Translation\MessageCatalogue;
2323
use Symfony\Component\Translation\Translator;
24+
use Symfony\Component\Translation\DataCollectorTranslator;
25+
use Symfony\Component\Translation\LoggingTranslator;
2426

2527
/**
2628
* Helps finding unused or missing translation messages in a given locale
@@ -295,7 +297,7 @@ private function loadFallbackCatalogues($locale, $transPaths, TranslationLoader
295297
{
296298
$fallbackCatalogues = array();
297299
$translator = $this->getContainer()->get('translator');
298-
if ($translator instanceof Translator) {
300+
if ($translator instanceof Translator || $translator instanceof DataCollectorTranslator || $translator instanceof LoggingTranslator) {
299301
foreach ($translator->getFallbackLocales() as $fallbackLocale) {
300302
if ($fallbackLocale === $locale) {
301303
continue;

0 commit comments

Comments
 (0)