bug #38285 [Contracts][Translation] Optional Intl dependency (ro0NL)

fabpot · fabpot · commit 8611b0b32f47 · 2020-09-24T11:41:33.000+02:00
This PR was merged into the 4.4 branch. Discussion ---------- [Contracts][Translation] Optional Intl dependency | Q | A | ------------- | --- | Branch? | 4.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | Fix #...  | License | MIT | Doc PR | symfony/symfony-docs#...  same as #38283, and should help streamlining #38230 Commits ------- d65d39d [Contracts][Translation] Optional Intl dependency
diff --git a/src/Symfony/Contracts/Translation/TranslatorTrait.php b/src/Symfony/Contracts/Translation/TranslatorTrait.php
@@ -35,7 +35,7 @@ public function setLocale($locale)
      */
     public function getLocale()
     {
-        return $this->locale ?: \Locale::getDefault();
+        return $this->locale ?: (class_exists(\Locale::class) ? \Locale::getDefault() : 'en');
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ public function setLocale($locale)`
`35`	`35`	`*/`
`36`	`36`	`public function getLocale()`
`37`	`37`	`{`
`38`		`- return $this->locale ?: \Locale::getDefault();`
	`38`	`+ return $this->locale ?: (class_exists(\Locale::class) ? \Locale::getDefault() : 'en');`
`39`	`39`	`}`
`40`	`40`
`41`	`41`	`/**`