Skip to content

Commit 7403f37

Browse files
committed
Merge branch '3.3' into 3.4
* 3.3: (64 commits) Show exception is checked twice in ExceptionController of twig allow SSI fragments configuration in XML files Display a better error message when the toolbar cannot be displayed render hidden _method field in form_rest() Add Doctrine Cache to dev dependencies to fix failing unit tests. return fallback locales whenever possible Fix Predis client cluster with pipeline [Dotenv] Test load() with multiple paths [Console] Fix catching exception type in QuestionHelper Improved the exception page when there is no message [WebProfilerBundle] Eliminate line wrap on count columnt (routing) [Validator] replace hardcoded service id [Routing] Fix XmlFileLoader exception message [DI] Dedup tags when using instanceof/autoconfigure [Translation] Fix FileLoader::loadResource() php doc Sessions: configurable "use_strict_mode" option for NativeSessionStorage [FrameworkBundle] [Command] Clean bundle directory, fixes #23177 fixed CS [WebProfilerBundle] Fix the icon for the Cache panel [WebServerBundle] Fix router script path and check existence ...
2 parents 0c12c0c + c664b86 commit 7403f37

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

DataCollectorTranslator.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ public function getCatalogue($locale = null)
9797
*/
9898
public function getFallbackLocales()
9999
{
100-
if ($this->translator instanceof Translator) {
100+
if ($this->translator instanceof Translator || method_exists($this->translator, 'getFallbackLocales')) {
101101
return $this->translator->getFallbackLocales();
102102
}
103103

Loader/FileLoader.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ public function load($resource, $locale, $domain = 'messages')
5454
return $catalogue;
5555
}
5656

57-
/*
57+
/**
5858
* @param string $resource
5959
*
6060
* @return array

LoggingTranslator.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ public function getCatalogue($locale = null)
9696
*/
9797
public function getFallbackLocales()
9898
{
99-
if ($this->translator instanceof Translator) {
99+
if ($this->translator instanceof Translator || method_exists($this->translator, 'getFallbackLocales')) {
100100
return $this->translator->getFallbackLocales();
101101
}
102102

0 commit comments

Comments
 (0)