bug #32014 Do not log or call the proxy function when the locale is the same (gmponos)

fabpot · fabpot · commit dab7a554ae11 · 2019-06-13T11:55:06.000+02:00
This PR was squashed before being merged into the 4.3 branch (closes #32014). Discussion ---------- Do not log or call the proxy function when the locale is the same | Q | A | ------------- | --- | Branch? | 4.3 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | License | MIT I was the one creating the PR for logging the change of the locale but ATM I am filled with logs of translator about switching the locale from "en" to "en".. Not sure why. Commits ------- 31bdfb3 Do not log or call the proxy function when the locale is the same
diff --git a/src/Symfony/Component/Translation/LoggingTranslator.php b/src/Symfony/Component/Translation/LoggingTranslator.php
@@ -84,6 +84,10 @@ public function setLocale($locale)
     {
         $prev = $this->translator->getLocale();
         $this->translator->setLocale($locale);
+        if ($prev === $locale) {
+            return;
+        }
+
         $this->logger->debug(sprintf('The locale of the translator has changed from "%s" to "%s".', $prev, $locale));
     }
 

Original file line number	Diff line number	Diff line change
`@@ -84,6 +84,10 @@ public function setLocale($locale)`
`84`	`84`	`{`
`85`	`85`	`$prev = $this->translator->getLocale();`
`86`	`86`	`$this->translator->setLocale($locale);`
	`87`	`+ if ($prev === $locale) {`
	`88`	`+ return;`
	`89`	`+ }`
	`90`	`+`
`87`	`91`	`$this->logger->debug(sprintf('The locale of the translator has changed from "%s" to "%s".', $prev, $locale));`
`88`	`92`	`}`
`89`	`93`