fix(translation): Detect the language first and then ask all providers for translations

Signed-off-by: Joas Schilling <coding@schilljs.com>

diff --git a/lib/private/Translation/TranslationManager.php b/lib/private/Translation/TranslationManager.php
index ec829e832559d87cf99be89155235c92c764e9fb..3fded754f6a0704bb61a2ad0860a490fe364f31f 100644 (file)
--- a/lib/private/Translation/TranslationManager.php
+++ b/lib/private/Translation/TranslationManager.php
@@ -63,15 +63,23 @@ class TranslationManager implements ITranslationManager {
                        throw new PreConditionNotMetException('No translation providers available');
                }
 
-               foreach ($this->getProviders() as $provider) {
-                       if ($fromLanguage === null && $provider instanceof IDetectLanguageProvider) {
-                               $fromLanguage = $provider->detectLanguage($text);
+               if ($fromLanguage === null) {
+                       foreach ($this->getProviders() as $provider) {
+                               if ($provider instanceof IDetectLanguageProvider) {
+                                       $fromLanguage = $provider->detectLanguage($text);
+                               }
+
+                               if ($fromLanguage !== null) {
+                                       break;
+                               }
                        }
 
                        if ($fromLanguage === null) {
                                throw new InvalidArgumentException('Could not detect language');
                        }
+               }
 
+               foreach ($this->getProviders() as $provider) {
                        try {
                                return $provider->translate($fromLanguage, $toLanguage, $text);
                        } catch (RuntimeException $e) {