bug #23250 [Translation] return fallback locales whenever possible (xabbuh)

fabpot · fabpot · commit 9a0d342226a3 · 2017-06-21T07:18:43.000-07:00
This PR was merged into the 2.7 branch. Discussion ---------- [Translation] return fallback locales whenever possible | Q | A | ------------- | --- | Branch? | 2.7 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #23248 | License | MIT | Doc PR | Commits ------- 3c21650 return fallback locales whenever possible
diff --git a/src/Symfony/Component/Translation/DataCollectorTranslator.php b/src/Symfony/Component/Translation/DataCollectorTranslator.php
@@ -95,7 +95,7 @@ public function getCatalogue($locale = null)
      */
     public function getFallbackLocales()
     {
-        if ($this->translator instanceof Translator) {
+        if ($this->translator instanceof Translator || method_exists($this->translator, 'getFallbackLocales')) {
             return $this->translator->getFallbackLocales();
         }
 
diff --git a/src/Symfony/Component/Translation/LoggingTranslator.php b/src/Symfony/Component/Translation/LoggingTranslator.php
@@ -95,7 +95,7 @@ public function getCatalogue($locale = null)
      */
     public function getFallbackLocales()
     {
-        if ($this->translator instanceof Translator) {
+        if ($this->translator instanceof Translator || method_exists($this->translator, 'getFallbackLocales')) {
             return $this->translator->getFallbackLocales();
         }
 

Original file line number	Diff line number	Diff line change
`@@ -95,7 +95,7 @@ public function getCatalogue($locale = null)`
`95`	`95`	`*/`
`96`	`96`	`public function getFallbackLocales()`
`97`	`97`	`{`
`98`		`- if ($this->translator instanceof Translator) {`
	`98`	`+ if ($this->translator instanceof Translator \|\| method_exists($this->translator, 'getFallbackLocales')) {`
`99`	`99`	`return $this->translator->getFallbackLocales();`
`100`	`100`	`}`
`101`	`101`